Skip to content

Commit 120b0c0

Browse files
geoffw0geoffw0
committed
CPP: Modernize the TemplateVariables test and have the TemplateVariables actually included in the scope of the test.
1 parent 68196df commit 120b0c0

2 files changed

Lines changed: 52 additions & 44 deletions

File tree

‎cpp/ql/test/library-tests/templates/variables/template_variables.expected‎

Lines changed: 44 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,44 @@
1-
| variables.cpp:2:13:2:13 | pi | variables.cpp:25:12:25:16 | pi | 0 | T |
2-
| variables.cpp:2:13:2:13 | pi | variables.cpp:25:12:25:16 | pi | 0 | float |
3-
| variables.cpp:2:13:2:13 | pi | variables.cpp:25:12:25:16 | pi | 0 | int |
4-
| variables.cpp:2:13:2:13 | pi | variables.cpp:37:16:37:24 | pi | 0 | float |
5-
| variables.cpp:2:13:2:13 | pi | variables.cpp:38:16:38:22 | pi | 0 | int |
6-
| variables.cpp:8:13:8:13 | multi_arg | variables.cpp:33:19:33:33 | multi_arg | 0 | S |
7-
| variables.cpp:8:13:8:13 | multi_arg | variables.cpp:33:19:33:33 | multi_arg | 0 | float |
8-
| variables.cpp:8:13:8:13 | multi_arg | variables.cpp:33:19:33:33 | multi_arg | 0 | short |
9-
| variables.cpp:8:13:8:13 | multi_arg | variables.cpp:33:19:33:33 | multi_arg | 1 | T |
10-
| variables.cpp:8:13:8:13 | multi_arg | variables.cpp:33:19:33:33 | multi_arg | 1 | char |
11-
| variables.cpp:8:13:8:13 | multi_arg | variables.cpp:33:19:33:33 | multi_arg | 1 | long |
12-
| variables.cpp:8:13:8:13 | multi_arg | variables.cpp:40:23:40:60 | multi_arg | 0 | unsigned int |
13-
| variables.cpp:8:13:8:13 | multi_arg | variables.cpp:40:23:40:60 | multi_arg | 1 | unsigned char |
14-
| variables.cpp:8:13:8:13 | multi_arg | variables.cpp:41:23:41:42 | multi_arg | 0 | int |
15-
| variables.cpp:8:13:8:13 | multi_arg | variables.cpp:41:23:41:42 | multi_arg | 1 | char |
16-
| variables.cpp:11:3:11:3 | mutable_val | variables.cpp:26:3:26:16 | mutable_val | 0 | T |
17-
| variables.cpp:11:3:11:3 | mutable_val | variables.cpp:26:3:26:16 | mutable_val | 0 | float |
18-
| variables.cpp:11:3:11:3 | mutable_val | variables.cpp:26:3:26:16 | mutable_val | 0 | int |
19-
| variables.cpp:11:3:11:3 | mutable_val | variables.cpp:43:3:43:18 | mutable_val | 0 | int |
20-
| variables.cpp:11:3:11:3 | mutable_val | variables.cpp:44:3:44:19 | mutable_val | 0 | long |
21-
| variables.cpp:19:8:19:8 | bar | variables.cpp:27:3:27:13 | bar | 0 | T |
22-
| variables.cpp:19:8:19:8 | bar | variables.cpp:27:3:27:13 | bar | 0 | float |
23-
| variables.cpp:19:8:19:8 | bar | variables.cpp:27:3:27:13 | bar | 0 | int |
24-
| variables.cpp:19:8:19:8 | bar | variables.cpp:46:3:46:17 | bar | 0 | short |
25-
| variables.cpp:19:8:19:8 | bar | variables.cpp:47:3:47:18 | bar | 0 | double |
26-
| variables.cpp:21:5:21:15 | no_template | variables.cpp:28:3:28:13 | no_template | -1 | <none> |
27-
| variables.cpp:21:5:21:15 | no_template | variables.cpp:28:3:28:13 | no_template | -1 | <none> |
28-
| variables.cpp:21:5:21:15 | no_template | variables.cpp:28:3:28:13 | no_template | -1 | <none> |
29-
| variables.cpp:21:5:21:15 | no_template | variables.cpp:49:3:49:13 | no_template | -1 | <none> |
30-
| variables.cpp:24:27:24:29 | val | variables.cpp:26:20:26:22 | val | -1 | <none> |
31-
| variables.cpp:24:27:24:29 | val | variables.cpp:26:20:26:22 | val | -1 | <none> |
32-
| variables.cpp:24:27:24:29 | val | variables.cpp:26:20:26:22 | val | -1 | <none> |
33-
| variables.cpp:24:27:24:29 | val | variables.cpp:27:17:27:19 | val | -1 | <none> |
34-
| variables.cpp:24:27:24:29 | val | variables.cpp:27:17:27:19 | val | -1 | <none> |
35-
| variables.cpp:24:27:24:29 | val | variables.cpp:27:17:27:19 | val | -1 | <none> |
1+
| file://:0:0:0:0 | fp_offset | | | |
2+
| file://:0:0:0:0 | gp_offset | | | |
3+
| file://:0:0:0:0 | overflow_arg_area | | | |
4+
| file://:0:0:0:0 | p#0 | | | |
5+
| file://:0:0:0:0 | p#0 | | | |
6+
| file://:0:0:0:0 | p#0 | | | |
7+
| file://:0:0:0:0 | p#0 | | | |
8+
| file://:0:0:0:0 | reg_save_area | | | |
9+
| variables.cpp:2:13:2:13 | pi | variables.cpp:25:12:25:16 | T | |
10+
| variables.cpp:2:13:2:13 | pi | variables.cpp:25:12:25:16, variables.cpp:37:16:37:24 | float | |
11+
| variables.cpp:2:13:2:13 | pi | variables.cpp:25:12:25:16, variables.cpp:38:16:38:22 | int | |
12+
| variables.cpp:2:16:2:16 | pi | | T | TemplateVariable |
13+
| variables.cpp:5:23:5:37 | pi | | const char * | |
14+
| variables.cpp:8:13:8:13 | multi_arg | variables.cpp:33:19:33:33 | S, T | |
15+
| variables.cpp:8:13:8:13 | multi_arg | variables.cpp:33:19:33:33 | float, char | |
16+
| variables.cpp:8:13:8:13 | multi_arg | variables.cpp:33:19:33:33 | short, long | |
17+
| variables.cpp:8:13:8:13 | multi_arg | variables.cpp:40:23:40:60 | unsigned int, unsigned char | |
18+
| variables.cpp:8:13:8:13 | multi_arg | variables.cpp:41:23:41:42 | int, char | |
19+
| variables.cpp:8:23:8:23 | multi_arg | | S, T | TemplateVariable |
20+
| variables.cpp:11:3:11:3 | mutable_val | variables.cpp:26:3:26:16 | T | |
21+
| variables.cpp:11:3:11:3 | mutable_val | variables.cpp:26:3:26:16 | float | |
22+
| variables.cpp:11:3:11:3 | mutable_val | variables.cpp:26:3:26:16, variables.cpp:43:3:43:18 | int | |
23+
| variables.cpp:11:3:11:3 | mutable_val | variables.cpp:44:3:44:19 | long | |
24+
| variables.cpp:11:15:11:15 | mutable_val | | T | TemplateVariable |
25+
| variables.cpp:19:3:19:10 | bar | | T | TemplateVariable |
26+
| variables.cpp:19:8:19:8 | bar | variables.cpp:27:3:27:13 | T | |
27+
| variables.cpp:19:8:19:8 | bar | variables.cpp:27:3:27:13 | float | |
28+
| variables.cpp:19:8:19:8 | bar | variables.cpp:27:3:27:13 | int | |
29+
| variables.cpp:19:8:19:8 | bar | variables.cpp:46:3:46:17 | short | |
30+
| variables.cpp:19:8:19:8 | bar | variables.cpp:47:3:47:18 | double | |
31+
| variables.cpp:21:5:21:15 | no_template | variables.cpp:28:3:28:13, variables.cpp:28:3:28:13, variables.cpp:28:3:28:13, variables.cpp:49:3:49:13 | | |
32+
| variables.cpp:24:27:24:29 | val | variables.cpp:26:20:26:22, variables.cpp:27:17:27:19 | | |
33+
| variables.cpp:24:27:24:29 | val | variables.cpp:26:20:26:22, variables.cpp:27:17:27:19 | | |
34+
| variables.cpp:24:27:24:29 | val | variables.cpp:26:20:26:22, variables.cpp:27:17:27:19 | | |
35+
| variables.cpp:25:5:25:8 | pi_t | | | |
36+
| variables.cpp:25:5:25:8 | pi_t | | | |
37+
| variables.cpp:25:5:25:8 | pi_t | | | |
38+
| variables.cpp:33:5:33:15 | multi_arg_s | | | |
39+
| variables.cpp:33:5:33:15 | multi_arg_s | | | |
40+
| variables.cpp:33:5:33:15 | multi_arg_s | | | |
41+
| variables.cpp:37:9:37:12 | pi_f | | | |
42+
| variables.cpp:38:9:38:12 | pi_i | | | |
43+
| variables.cpp:40:9:40:19 | multi_arg_a | | | |
44+
| variables.cpp:41:9:41:19 | multi_arg_b | | | |

‎cpp/ql/test/library-tests/templates/variables/template_variables.ql‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
import cpp
22

3-
from Variable v, VariableAccess a, int i, string s
4-
where
5-
v = a.getTarget() and
6-
if exists(v.getATemplateArgument())
7-
then s = v.getTemplateArgument(i).toString()
8-
else (
9-
s = "<none>" and i = -1
10-
)
11-
select v, a, i, s
3+
string describe(Variable v) {
4+
v instanceof TemplateVariable and
5+
result = "TemplateVariable"
6+
}
7+
8+
from Variable v
9+
select v, concat(VariableAccess a | a.getTarget() = v | a.getLocation().toString(), ", "),
10+
concat(int i | | v.getTemplateArgument(i).toString(), ", " order by i), concat(describe(v), ", ")

0 commit comments

Comments
 (0)