Skip to content

Commit c998370

Browse files
committed
C++: Accept more test changes.
1 parent 36585a7 commit c998370

File tree

4 files changed

+96
-6
lines changed

4 files changed

+96
-6
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
| file://:0:0:0:0 | __wchar_t * | PointerType | Wchar_t, WideCharType |
1+
| file://:0:0:0:0 | __wchar_t * | IteratorByPointer, PointerType | Wchar_t, WideCharType |
22
| file://:0:0:0:0 | const __wchar_t | SpecifiedType | Wchar_t, WideCharType |
33
| file://:0:0:0:0 | wchar_t | Wchar_t, WideCharType | |
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
| file://:0:0:0:0 | wchar_t | Wchar_t, WideCharType | |
2-
| file://:0:0:0:0 | wchar_t * | PointerType | CTypedefType, Wchar_t |
2+
| file://:0:0:0:0 | wchar_t * | IteratorByPointer, PointerType | CTypedefType, Wchar_t |
33
| ms.c:2:24:2:30 | wchar_t | CTypedefType, Wchar_t | |

cpp/ql/test/library-tests/variables/variables/types.expected

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
| char8_t | Char8Type | | | | |
3131
| char16_t | Char16Type | | | | |
3232
| char32_t | Char32Type | | | | |
33-
| char * | CharPointerType | | char | | |
33+
| char * | CharPointerType, IteratorByPointer | | char | | |
3434
| char *[3] | ArrayType | char * | char * | | |
3535
| char *[32] | ArrayType | char * | char * | | |
3636
| char *[] | ArrayType | char * | char * | | |
@@ -48,7 +48,7 @@
4848
| const address | SpecifiedType | | address | | |
4949
| const address & | LValueReferenceType | | const address | | |
5050
| const char | SpecifiedType | | char | | |
51-
| const char * | PointerType | | const char | | |
51+
| const char * | IteratorByPointer, PointerType | | const char | | |
5252
| const char *[3] | ArrayType | const char * | const char * | | |
5353
| const char *[] | ArrayType | const char * | const char * | | |
5454
| const char[5] | ArrayType | const char | const char | | |
@@ -65,7 +65,7 @@
6565
| float | FloatType | | | | |
6666
| float[3] | ArrayType | float | float | | |
6767
| int | IntType, MicrosoftInt32Type | | | | |
68-
| int * | IntPointerType | | int | | |
68+
| int * | IntPointerType, IteratorByPointer | | int | | |
6969
| int[4] | ArrayType | int | int | | |
7070
| int[8] | ArrayType | int | int | | |
7171
| int[10] | ArrayType | int | int | | |
@@ -90,5 +90,5 @@
9090
| unsigned long long | LongLongType | | | | unsigned integral |
9191
| unsigned short | ShortType | | | | unsigned integral |
9292
| void | VoidType | | | | |
93-
| void * | VoidPointerType | | void | | |
93+
| void * | IteratorByPointer, VoidPointerType | | void | | |
9494
| wchar_t | Wchar_t, WideCharType | | | | |
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,137 @@
11
edges
2+
| test.cpp:26:29:26:29 | b | test.cpp:26:29:26:29 | b |
23
| test.cpp:26:29:26:29 | b | test.cpp:27:2:27:2 | b |
34
| test.cpp:30:34:30:34 | b | test.cpp:31:2:31:2 | b |
5+
| test.cpp:34:31:34:31 | b | test.cpp:34:31:34:31 | b |
46
| test.cpp:34:31:34:31 | b | test.cpp:35:2:35:2 | b |
7+
| test.cpp:38:35:38:35 | d | test.cpp:38:35:38:35 | d |
8+
| test.cpp:38:35:38:35 | d | test.cpp:39:2:39:2 | d |
9+
| test.cpp:42:40:42:40 | d | test.cpp:43:2:43:2 | d |
10+
| test.cpp:46:37:46:37 | d | test.cpp:46:37:46:37 | d |
11+
| test.cpp:46:37:46:37 | d | test.cpp:47:2:47:2 | d |
512
| test.cpp:50:31:50:31 | b | test.cpp:51:11:51:11 | b |
613
| test.cpp:57:19:57:19 | d | test.cpp:26:29:26:29 | b |
14+
| test.cpp:57:19:57:19 | d | test.cpp:57:19:57:19 | ref arg d |
15+
| test.cpp:57:19:57:19 | ref arg d | test.cpp:58:25:58:25 | d |
16+
| test.cpp:57:19:57:19 | ref arg d | test.cpp:59:21:59:21 | d |
17+
| test.cpp:57:19:57:19 | ref arg d | test.cpp:61:22:61:22 | d |
18+
| test.cpp:57:19:57:19 | ref arg d | test.cpp:62:28:62:28 | d |
19+
| test.cpp:57:19:57:19 | ref arg d | test.cpp:63:24:63:24 | d |
20+
| test.cpp:57:19:57:19 | ref arg d | test.cpp:95:21:95:21 | d |
721
| test.cpp:58:25:58:25 | d | test.cpp:30:34:30:34 | b |
822
| test.cpp:59:21:59:21 | d | test.cpp:34:31:34:31 | b |
23+
| test.cpp:59:21:59:21 | d | test.cpp:59:21:59:21 | ref arg d |
24+
| test.cpp:59:21:59:21 | ref arg d | test.cpp:61:22:61:22 | d |
25+
| test.cpp:59:21:59:21 | ref arg d | test.cpp:62:28:62:28 | d |
26+
| test.cpp:59:21:59:21 | ref arg d | test.cpp:63:24:63:24 | d |
27+
| test.cpp:59:21:59:21 | ref arg d | test.cpp:95:21:95:21 | d |
28+
| test.cpp:61:22:61:22 | d | test.cpp:38:35:38:35 | d |
29+
| test.cpp:61:22:61:22 | d | test.cpp:61:22:61:22 | ref arg d |
30+
| test.cpp:61:22:61:22 | ref arg d | test.cpp:62:28:62:28 | d |
31+
| test.cpp:61:22:61:22 | ref arg d | test.cpp:63:24:63:24 | d |
32+
| test.cpp:61:22:61:22 | ref arg d | test.cpp:95:21:95:21 | d |
33+
| test.cpp:62:28:62:28 | d | test.cpp:42:40:42:40 | d |
34+
| test.cpp:63:24:63:24 | d | test.cpp:46:37:46:37 | d |
35+
| test.cpp:63:24:63:24 | d | test.cpp:63:24:63:24 | ref arg d |
36+
| test.cpp:63:24:63:24 | ref arg d | test.cpp:95:21:95:21 | d |
937
| test.cpp:74:19:74:21 | dss | test.cpp:26:29:26:29 | b |
38+
| test.cpp:74:19:74:21 | dss | test.cpp:74:19:74:21 | ref arg dss |
39+
| test.cpp:74:19:74:21 | ref arg dss | test.cpp:75:25:75:27 | dss |
40+
| test.cpp:74:19:74:21 | ref arg dss | test.cpp:76:21:76:23 | dss |
41+
| test.cpp:74:19:74:21 | ref arg dss | test.cpp:96:21:96:23 | dss |
1042
| test.cpp:75:25:75:27 | dss | test.cpp:30:34:30:34 | b |
1143
| test.cpp:76:21:76:23 | dss | test.cpp:34:31:34:31 | b |
44+
| test.cpp:76:21:76:23 | dss | test.cpp:76:21:76:23 | ref arg dss |
45+
| test.cpp:76:21:76:23 | ref arg dss | test.cpp:96:21:96:23 | dss |
1246
| test.cpp:86:19:86:20 | d2 | test.cpp:26:29:26:29 | b |
47+
| test.cpp:86:19:86:20 | d2 | test.cpp:86:19:86:20 | ref arg d2 |
48+
| test.cpp:86:19:86:20 | ref arg d2 | test.cpp:87:25:87:26 | d2 |
49+
| test.cpp:86:19:86:20 | ref arg d2 | test.cpp:88:21:88:22 | d2 |
50+
| test.cpp:86:19:86:20 | ref arg d2 | test.cpp:90:22:90:23 | d2 |
51+
| test.cpp:86:19:86:20 | ref arg d2 | test.cpp:91:28:91:29 | d2 |
52+
| test.cpp:86:19:86:20 | ref arg d2 | test.cpp:92:24:92:25 | d2 |
1353
| test.cpp:87:25:87:26 | d2 | test.cpp:30:34:30:34 | b |
1454
| test.cpp:88:21:88:22 | d2 | test.cpp:34:31:34:31 | b |
55+
| test.cpp:88:21:88:22 | d2 | test.cpp:88:21:88:22 | ref arg d2 |
56+
| test.cpp:88:21:88:22 | ref arg d2 | test.cpp:90:22:90:23 | d2 |
57+
| test.cpp:88:21:88:22 | ref arg d2 | test.cpp:91:28:91:29 | d2 |
58+
| test.cpp:88:21:88:22 | ref arg d2 | test.cpp:92:24:92:25 | d2 |
59+
| test.cpp:90:22:90:23 | d2 | test.cpp:38:35:38:35 | d |
60+
| test.cpp:90:22:90:23 | d2 | test.cpp:90:22:90:23 | ref arg d2 |
61+
| test.cpp:90:22:90:23 | ref arg d2 | test.cpp:91:28:91:29 | d2 |
62+
| test.cpp:90:22:90:23 | ref arg d2 | test.cpp:92:24:92:25 | d2 |
63+
| test.cpp:91:28:91:29 | d2 | test.cpp:42:40:42:40 | d |
64+
| test.cpp:92:24:92:25 | d2 | test.cpp:46:37:46:37 | d |
1565
| test.cpp:95:21:95:21 | d | test.cpp:50:31:50:31 | b |
1666
| test.cpp:96:21:96:23 | dss | test.cpp:50:31:50:31 | b |
1767
nodes
1868
| test.cpp:26:29:26:29 | b | semmle.label | b |
69+
| test.cpp:26:29:26:29 | b | semmle.label | b |
1970
| test.cpp:27:2:27:2 | b | semmle.label | b |
2071
| test.cpp:30:34:30:34 | b | semmle.label | b |
2172
| test.cpp:31:2:31:2 | b | semmle.label | b |
2273
| test.cpp:34:31:34:31 | b | semmle.label | b |
74+
| test.cpp:34:31:34:31 | b | semmle.label | b |
2375
| test.cpp:35:2:35:2 | b | semmle.label | b |
76+
| test.cpp:38:35:38:35 | d | semmle.label | d |
77+
| test.cpp:38:35:38:35 | d | semmle.label | d |
78+
| test.cpp:39:2:39:2 | d | semmle.label | d |
79+
| test.cpp:42:40:42:40 | d | semmle.label | d |
80+
| test.cpp:43:2:43:2 | d | semmle.label | d |
81+
| test.cpp:46:37:46:37 | d | semmle.label | d |
82+
| test.cpp:46:37:46:37 | d | semmle.label | d |
83+
| test.cpp:47:2:47:2 | d | semmle.label | d |
2484
| test.cpp:50:31:50:31 | b | semmle.label | b |
2585
| test.cpp:51:11:51:11 | b | semmle.label | b |
2686
| test.cpp:57:19:57:19 | d | semmle.label | d |
87+
| test.cpp:57:19:57:19 | ref arg d | semmle.label | ref arg d |
2788
| test.cpp:58:25:58:25 | d | semmle.label | d |
2889
| test.cpp:59:21:59:21 | d | semmle.label | d |
90+
| test.cpp:59:21:59:21 | ref arg d | semmle.label | ref arg d |
91+
| test.cpp:61:22:61:22 | d | semmle.label | d |
92+
| test.cpp:61:22:61:22 | ref arg d | semmle.label | ref arg d |
93+
| test.cpp:62:28:62:28 | d | semmle.label | d |
94+
| test.cpp:63:24:63:24 | d | semmle.label | d |
95+
| test.cpp:63:24:63:24 | ref arg d | semmle.label | ref arg d |
2996
| test.cpp:74:19:74:21 | dss | semmle.label | dss |
97+
| test.cpp:74:19:74:21 | ref arg dss | semmle.label | ref arg dss |
3098
| test.cpp:75:25:75:27 | dss | semmle.label | dss |
3199
| test.cpp:76:21:76:23 | dss | semmle.label | dss |
100+
| test.cpp:76:21:76:23 | ref arg dss | semmle.label | ref arg dss |
32101
| test.cpp:86:19:86:20 | d2 | semmle.label | d2 |
102+
| test.cpp:86:19:86:20 | ref arg d2 | semmle.label | ref arg d2 |
33103
| test.cpp:87:25:87:26 | d2 | semmle.label | d2 |
34104
| test.cpp:88:21:88:22 | d2 | semmle.label | d2 |
105+
| test.cpp:88:21:88:22 | ref arg d2 | semmle.label | ref arg d2 |
106+
| test.cpp:90:22:90:23 | d2 | semmle.label | d2 |
107+
| test.cpp:90:22:90:23 | ref arg d2 | semmle.label | ref arg d2 |
108+
| test.cpp:91:28:91:29 | d2 | semmle.label | d2 |
109+
| test.cpp:92:24:92:25 | d2 | semmle.label | d2 |
35110
| test.cpp:95:21:95:21 | d | semmle.label | d |
36111
| test.cpp:96:21:96:23 | dss | semmle.label | dss |
37112
subpaths
113+
| test.cpp:57:19:57:19 | d | test.cpp:26:29:26:29 | b | test.cpp:26:29:26:29 | b | test.cpp:57:19:57:19 | ref arg d |
114+
| test.cpp:59:21:59:21 | d | test.cpp:34:31:34:31 | b | test.cpp:34:31:34:31 | b | test.cpp:59:21:59:21 | ref arg d |
115+
| test.cpp:61:22:61:22 | d | test.cpp:38:35:38:35 | d | test.cpp:38:35:38:35 | d | test.cpp:61:22:61:22 | ref arg d |
116+
| test.cpp:63:24:63:24 | d | test.cpp:46:37:46:37 | d | test.cpp:46:37:46:37 | d | test.cpp:63:24:63:24 | ref arg d |
117+
| test.cpp:74:19:74:21 | dss | test.cpp:26:29:26:29 | b | test.cpp:26:29:26:29 | b | test.cpp:74:19:74:21 | ref arg dss |
118+
| test.cpp:76:21:76:23 | dss | test.cpp:34:31:34:31 | b | test.cpp:34:31:34:31 | b | test.cpp:76:21:76:23 | ref arg dss |
119+
| test.cpp:86:19:86:20 | d2 | test.cpp:26:29:26:29 | b | test.cpp:26:29:26:29 | b | test.cpp:86:19:86:20 | ref arg d2 |
120+
| test.cpp:88:21:88:22 | d2 | test.cpp:34:31:34:31 | b | test.cpp:34:31:34:31 | b | test.cpp:88:21:88:22 | ref arg d2 |
121+
| test.cpp:90:22:90:23 | d2 | test.cpp:38:35:38:35 | d | test.cpp:38:35:38:35 | d | test.cpp:90:22:90:23 | ref arg d2 |
38122
#select
39123
| test.cpp:27:2:27:2 | b | test.cpp:57:19:57:19 | d | test.cpp:27:2:27:2 | b | Pointer arithmetic here may be done with the wrong type because of the cast $@. | test.cpp:57:19:57:19 | d | here |
40124
| test.cpp:27:2:27:2 | b | test.cpp:74:19:74:21 | dss | test.cpp:27:2:27:2 | b | Pointer arithmetic here may be done with the wrong type because of the cast $@. | test.cpp:74:19:74:21 | dss | here |
41125
| test.cpp:27:2:27:2 | b | test.cpp:86:19:86:20 | d2 | test.cpp:27:2:27:2 | b | Pointer arithmetic here may be done with the wrong type because of the cast $@. | test.cpp:86:19:86:20 | d2 | here |
126+
| test.cpp:31:2:31:2 | b | test.cpp:57:19:57:19 | d | test.cpp:31:2:31:2 | b | Pointer arithmetic here may be done with the wrong type because of the cast $@. | test.cpp:57:19:57:19 | d | here |
42127
| test.cpp:31:2:31:2 | b | test.cpp:58:25:58:25 | d | test.cpp:31:2:31:2 | b | Pointer arithmetic here may be done with the wrong type because of the cast $@. | test.cpp:58:25:58:25 | d | here |
128+
| test.cpp:31:2:31:2 | b | test.cpp:74:19:74:21 | dss | test.cpp:31:2:31:2 | b | Pointer arithmetic here may be done with the wrong type because of the cast $@. | test.cpp:74:19:74:21 | dss | here |
43129
| test.cpp:31:2:31:2 | b | test.cpp:75:25:75:27 | dss | test.cpp:31:2:31:2 | b | Pointer arithmetic here may be done with the wrong type because of the cast $@. | test.cpp:75:25:75:27 | dss | here |
130+
| test.cpp:31:2:31:2 | b | test.cpp:86:19:86:20 | d2 | test.cpp:31:2:31:2 | b | Pointer arithmetic here may be done with the wrong type because of the cast $@. | test.cpp:86:19:86:20 | d2 | here |
44131
| test.cpp:31:2:31:2 | b | test.cpp:87:25:87:26 | d2 | test.cpp:31:2:31:2 | b | Pointer arithmetic here may be done with the wrong type because of the cast $@. | test.cpp:87:25:87:26 | d2 | here |
132+
| test.cpp:35:2:35:2 | b | test.cpp:57:19:57:19 | d | test.cpp:35:2:35:2 | b | Pointer arithmetic here may be done with the wrong type because of the cast $@. | test.cpp:57:19:57:19 | d | here |
45133
| test.cpp:35:2:35:2 | b | test.cpp:59:21:59:21 | d | test.cpp:35:2:35:2 | b | Pointer arithmetic here may be done with the wrong type because of the cast $@. | test.cpp:59:21:59:21 | d | here |
134+
| test.cpp:35:2:35:2 | b | test.cpp:74:19:74:21 | dss | test.cpp:35:2:35:2 | b | Pointer arithmetic here may be done with the wrong type because of the cast $@. | test.cpp:74:19:74:21 | dss | here |
46135
| test.cpp:35:2:35:2 | b | test.cpp:76:21:76:23 | dss | test.cpp:35:2:35:2 | b | Pointer arithmetic here may be done with the wrong type because of the cast $@. | test.cpp:76:21:76:23 | dss | here |
136+
| test.cpp:35:2:35:2 | b | test.cpp:86:19:86:20 | d2 | test.cpp:35:2:35:2 | b | Pointer arithmetic here may be done with the wrong type because of the cast $@. | test.cpp:86:19:86:20 | d2 | here |
47137
| test.cpp:35:2:35:2 | b | test.cpp:88:21:88:22 | d2 | test.cpp:35:2:35:2 | b | Pointer arithmetic here may be done with the wrong type because of the cast $@. | test.cpp:88:21:88:22 | d2 | here |

0 commit comments

Comments
 (0)