Skip to content

Commit c0884e9

Browse files
author
Matthew Gretton-Dann
committed
C++: Update expected results.
1 parent 3a7f9a5 commit c0884e9

File tree

4 files changed

+122
-56
lines changed

4 files changed

+122
-56
lines changed

cpp/ql/test/library-tests/noexcept/copy_from_prototype/copy_from_prototype.expected

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
| copy_from_prototype.cpp:13:7:13:7 | c | c<int>::c(const c<int> &) -> void | copy_from_prototype.cpp:13:7:13:7 | c<int> | <no expr> |
1414
| copy_from_prototype.cpp:13:7:13:7 | operator= | c<int>::operator=(c<int> &&) -> c<int> & | copy_from_prototype.cpp:13:7:13:7 | c<int> | <no expr> |
1515
| copy_from_prototype.cpp:13:7:13:7 | operator= | c<int>::operator=(const c<int> &) -> c<int> & | copy_from_prototype.cpp:13:7:13:7 | c<int> | <no expr> |
16-
| copy_from_prototype.cpp:14:26:14:26 | c | c<T>::c<(unnamed)>() -> void | copy_from_prototype.cpp:13:7:13:7 | c<T> | Unknown literal |
16+
| copy_from_prototype.cpp:14:26:14:26 | c | c<T>::c<(unnamed)>() -> void | copy_from_prototype.cpp:13:7:13:7 | c<T> | X |
1717
| copy_from_prototype.cpp:14:26:14:26 | c | c<int>::c<(unnamed)>() -> void | copy_from_prototype.cpp:13:7:13:7 | c<int> | <no expr> |
1818
| copy_from_prototype.cpp:17:7:17:7 | d | d::d() -> void | copy_from_prototype.cpp:17:7:17:7 | d | <no expr> |
1919
| copy_from_prototype.cpp:17:7:17:7 | d | d::d(const d &) -> void | copy_from_prototype.cpp:17:7:17:7 | d | <no expr> |
Lines changed: 108 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,108 @@
1-
| staticlocals__staticlocals_f2_extractor | false | 22465 | 22465 | f2 |
2-
| staticlocals__staticlocals_f2_extractor | false | 22470 | 22470 | declaration |
3-
| staticlocals__staticlocals_f2_extractor | false | 22472 | 22472 | declaration |
4-
| staticlocals__staticlocals_f2_extractor | false | 22474 | 22474 | declaration |
5-
| staticlocals__staticlocals_f2_extractor | false | 22476 | 22476 | declaration |
6-
| staticlocals__staticlocals_f2_extractor | false | 22478 | 22478 | return ... |
7-
| staticlocals__staticlocals_f2_extractor | false | 22480 | 22480 | { ... } |
8-
| staticlocals__staticlocals_f2_extractor | false | 22482 | 22482 | call to C |
9-
| staticlocals__staticlocals_f2_extractor | false | 22484 | 22484 | initializer for c |
10-
| staticlocals__staticlocals_f2_extractor | false | 22486 | 22486 | call to addOne |
11-
| staticlocals__staticlocals_f2_extractor | false | 22490 | 22490 | 2 |
12-
| staticlocals__staticlocals_f2_extractor | false | 22493 | 22493 | initializer for j |
13-
| staticlocals__staticlocals_f2_extractor | false | 22494 | 22494 | call to addOne |
14-
| staticlocals__staticlocals_f2_extractor | false | 22499 | 22499 | 2 |
15-
| staticlocals__staticlocals_f2_extractor | false | 22500 | 22500 | initializer for two |
16-
| staticlocals__staticlocals_f2_extractor | false | 22503 | 22503 | two |
17-
| staticlocals__staticlocals_f2_extractor | false | 22508 | 22508 | initializer for i |
18-
| staticlocals__staticlocals_f2_extractor | true | 22470 | 22500 | |
19-
| staticlocals__staticlocals_f2_extractor | true | 22472 | 22474 | |
20-
| staticlocals__staticlocals_f2_extractor | true | 22474 | 22476 | |
21-
| staticlocals__staticlocals_f2_extractor | true | 22476 | 22478 | |
22-
| staticlocals__staticlocals_f2_extractor | true | 22478 | 22465 | |
23-
| staticlocals__staticlocals_f2_extractor | true | 22480 | 22470 | |
24-
| staticlocals__staticlocals_f2_extractor | true | 22499 | 22472 | |
25-
| staticlocals__staticlocals_f2_extractor | true | 22500 | 22499 | |
26-
| staticlocals__staticlocals_f2_ql | false | 22465 | 22465 | f2 |
27-
| staticlocals__staticlocals_f2_ql | false | 22470 | 22470 | declaration |
28-
| staticlocals__staticlocals_f2_ql | false | 22472 | 22472 | declaration |
29-
| staticlocals__staticlocals_f2_ql | false | 22474 | 22474 | declaration |
30-
| staticlocals__staticlocals_f2_ql | false | 22476 | 22476 | declaration |
31-
| staticlocals__staticlocals_f2_ql | false | 22478 | 22478 | return ... |
32-
| staticlocals__staticlocals_f2_ql | false | 22480 | 22480 | { ... } |
33-
| staticlocals__staticlocals_f2_ql | false | 22482 | 22482 | call to C |
34-
| staticlocals__staticlocals_f2_ql | false | 22484 | 22484 | initializer for c |
35-
| staticlocals__staticlocals_f2_ql | false | 22486 | 22486 | call to addOne |
36-
| staticlocals__staticlocals_f2_ql | false | 22490 | 22490 | 2 |
37-
| staticlocals__staticlocals_f2_ql | false | 22493 | 22493 | initializer for j |
38-
| staticlocals__staticlocals_f2_ql | false | 22494 | 22494 | call to addOne |
39-
| staticlocals__staticlocals_f2_ql | false | 22499 | 22499 | 2 |
40-
| staticlocals__staticlocals_f2_ql | false | 22500 | 22500 | initializer for two |
41-
| staticlocals__staticlocals_f2_ql | false | 22503 | 22503 | two |
42-
| staticlocals__staticlocals_f2_ql | false | 22508 | 22508 | initializer for i |
43-
| staticlocals__staticlocals_f2_ql | true | 22470 | 22500 | |
44-
| staticlocals__staticlocals_f2_ql | true | 22472 | 22474 | |
45-
| staticlocals__staticlocals_f2_ql | true | 22474 | 22476 | |
46-
| staticlocals__staticlocals_f2_ql | true | 22476 | 22478 | |
47-
| staticlocals__staticlocals_f2_ql | true | 22476 | 22484 | |
48-
| staticlocals__staticlocals_f2_ql | true | 22478 | 22465 | |
49-
| staticlocals__staticlocals_f2_ql | true | 22480 | 22470 | |
50-
| staticlocals__staticlocals_f2_ql | true | 22482 | 22478 | |
51-
| staticlocals__staticlocals_f2_ql | true | 22484 | 22482 | |
52-
| staticlocals__staticlocals_f2_ql | true | 22499 | 22472 | |
53-
| staticlocals__staticlocals_f2_ql | true | 22500 | 22499 | |
1+
| pointer_to_member__pmIsConstT_extractor | false | 21747 | 21747 | pmIsConstT |
2+
| pointer_to_member__pmIsConstT_extractor | false | 21756 | 21756 | declaration |
3+
| pointer_to_member__pmIsConstT_extractor | false | 21759 | 21759 | return ... |
4+
| pointer_to_member__pmIsConstT_extractor | false | 21762 | 21762 | { ... } |
5+
| pointer_to_member__pmIsConstT_extractor | false | 21766 | 21766 | {...} |
6+
| pointer_to_member__pmIsConstT_extractor | false | 21773 | 21773 | x1 |
7+
| pointer_to_member__pmIsConstT_extractor | false | 21777 | 21777 | & ... |
8+
| pointer_to_member__pmIsConstT_extractor | false | 21784 | 21784 | f1 |
9+
| pointer_to_member__pmIsConstT_extractor | false | 21788 | 21788 | & ... |
10+
| pointer_to_member__pmIsConstT_extractor | false | 21791 | 21791 | initializer for pms |
11+
| pointer_to_member__pmIsConstT_extractor | true | 21756 | 21759 | |
12+
| pointer_to_member__pmIsConstT_extractor | true | 21759 | 21747 | |
13+
| pointer_to_member__pmIsConstT_extractor | true | 21762 | 21756 | |
14+
| pointer_to_member__pmIsConstT_ql | false | 21747 | 21747 | pmIsConstT |
15+
| pointer_to_member__pmIsConstT_ql | false | 21756 | 21756 | declaration |
16+
| pointer_to_member__pmIsConstT_ql | false | 21759 | 21759 | return ... |
17+
| pointer_to_member__pmIsConstT_ql | false | 21762 | 21762 | { ... } |
18+
| pointer_to_member__pmIsConstT_ql | false | 21766 | 21766 | {...} |
19+
| pointer_to_member__pmIsConstT_ql | false | 21773 | 21773 | x1 |
20+
| pointer_to_member__pmIsConstT_ql | false | 21777 | 21777 | & ... |
21+
| pointer_to_member__pmIsConstT_ql | false | 21784 | 21784 | f1 |
22+
| pointer_to_member__pmIsConstT_ql | false | 21788 | 21788 | & ... |
23+
| pointer_to_member__pmIsConstT_ql | false | 21791 | 21791 | initializer for pms |
24+
| pointer_to_member__pmIsConstT_ql | true | 21756 | 21791 | |
25+
| pointer_to_member__pmIsConstT_ql | true | 21759 | 21747 | |
26+
| pointer_to_member__pmIsConstT_ql | true | 21762 | 21756 | |
27+
| pointer_to_member__pmIsConstT_ql | true | 21766 | 21759 | |
28+
| pointer_to_member__pmIsConstT_ql | true | 21773 | 21777 | |
29+
| pointer_to_member__pmIsConstT_ql | true | 21777 | 21784 | |
30+
| pointer_to_member__pmIsConstT_ql | true | 21784 | 21788 | |
31+
| pointer_to_member__pmIsConstT_ql | true | 21788 | 21766 | |
32+
| pointer_to_member__pmIsConstT_ql | true | 21791 | 21773 | |
33+
| staticlocals__staticlocals_f2_extractor | false | 31503 | 31503 | f2 |
34+
| staticlocals__staticlocals_f2_extractor | false | 31509 | 31509 | declaration |
35+
| staticlocals__staticlocals_f2_extractor | false | 31512 | 31512 | declaration |
36+
| staticlocals__staticlocals_f2_extractor | false | 31515 | 31515 | declaration |
37+
| staticlocals__staticlocals_f2_extractor | false | 31518 | 31518 | declaration |
38+
| staticlocals__staticlocals_f2_extractor | false | 31521 | 31521 | return ... |
39+
| staticlocals__staticlocals_f2_extractor | false | 31524 | 31524 | { ... } |
40+
| staticlocals__staticlocals_f2_extractor | false | 31527 | 31527 | call to C |
41+
| staticlocals__staticlocals_f2_extractor | false | 31530 | 31530 | initializer for c |
42+
| staticlocals__staticlocals_f2_extractor | false | 31533 | 31533 | call to addOne |
43+
| staticlocals__staticlocals_f2_extractor | false | 31539 | 31539 | 2 |
44+
| staticlocals__staticlocals_f2_extractor | false | 31544 | 31544 | initializer for j |
45+
| staticlocals__staticlocals_f2_extractor | false | 31546 | 31546 | call to addOne |
46+
| staticlocals__staticlocals_f2_extractor | false | 31554 | 31554 | 2 |
47+
| staticlocals__staticlocals_f2_extractor | false | 31556 | 31556 | initializer for two |
48+
| staticlocals__staticlocals_f2_extractor | false | 31560 | 31560 | two |
49+
| staticlocals__staticlocals_f2_extractor | false | 31568 | 31568 | initializer for i |
50+
| staticlocals__staticlocals_f2_extractor | true | 31509 | 31556 | |
51+
| staticlocals__staticlocals_f2_extractor | true | 31512 | 31515 | |
52+
| staticlocals__staticlocals_f2_extractor | true | 31515 | 31518 | |
53+
| staticlocals__staticlocals_f2_extractor | true | 31518 | 31521 | |
54+
| staticlocals__staticlocals_f2_extractor | true | 31521 | 31503 | |
55+
| staticlocals__staticlocals_f2_extractor | true | 31524 | 31509 | |
56+
| staticlocals__staticlocals_f2_extractor | true | 31554 | 31512 | |
57+
| staticlocals__staticlocals_f2_extractor | true | 31556 | 31554 | |
58+
| staticlocals__staticlocals_f2_ql | false | 31503 | 31503 | f2 |
59+
| staticlocals__staticlocals_f2_ql | false | 31509 | 31509 | declaration |
60+
| staticlocals__staticlocals_f2_ql | false | 31512 | 31512 | declaration |
61+
| staticlocals__staticlocals_f2_ql | false | 31515 | 31515 | declaration |
62+
| staticlocals__staticlocals_f2_ql | false | 31518 | 31518 | declaration |
63+
| staticlocals__staticlocals_f2_ql | false | 31521 | 31521 | return ... |
64+
| staticlocals__staticlocals_f2_ql | false | 31524 | 31524 | { ... } |
65+
| staticlocals__staticlocals_f2_ql | false | 31527 | 31527 | call to C |
66+
| staticlocals__staticlocals_f2_ql | false | 31530 | 31530 | initializer for c |
67+
| staticlocals__staticlocals_f2_ql | false | 31533 | 31533 | call to addOne |
68+
| staticlocals__staticlocals_f2_ql | false | 31539 | 31539 | 2 |
69+
| staticlocals__staticlocals_f2_ql | false | 31544 | 31544 | initializer for j |
70+
| staticlocals__staticlocals_f2_ql | false | 31546 | 31546 | call to addOne |
71+
| staticlocals__staticlocals_f2_ql | false | 31554 | 31554 | 2 |
72+
| staticlocals__staticlocals_f2_ql | false | 31556 | 31556 | initializer for two |
73+
| staticlocals__staticlocals_f2_ql | false | 31560 | 31560 | two |
74+
| staticlocals__staticlocals_f2_ql | false | 31568 | 31568 | initializer for i |
75+
| staticlocals__staticlocals_f2_ql | true | 31509 | 31556 | |
76+
| staticlocals__staticlocals_f2_ql | true | 31512 | 31515 | |
77+
| staticlocals__staticlocals_f2_ql | true | 31515 | 31518 | |
78+
| staticlocals__staticlocals_f2_ql | true | 31518 | 31521 | |
79+
| staticlocals__staticlocals_f2_ql | true | 31518 | 31530 | |
80+
| staticlocals__staticlocals_f2_ql | true | 31521 | 31503 | |
81+
| staticlocals__staticlocals_f2_ql | true | 31524 | 31509 | |
82+
| staticlocals__staticlocals_f2_ql | true | 31527 | 31521 | |
83+
| staticlocals__staticlocals_f2_ql | true | 31530 | 31527 | |
84+
| staticlocals__staticlocals_f2_ql | true | 31554 | 31512 | |
85+
| staticlocals__staticlocals_f2_ql | true | 31556 | 31554 | |
86+
| staticlocals__staticlocals_f3_extractor | false | 31473 | 31473 | f3 |
87+
| staticlocals__staticlocals_f3_extractor | false | 31477 | 31477 | declaration |
88+
| staticlocals__staticlocals_f3_extractor | false | 31480 | 31480 | return ... |
89+
| staticlocals__staticlocals_f3_extractor | false | 31483 | 31483 | { ... } |
90+
| staticlocals__staticlocals_f3_extractor | false | 31492 | 31492 | value |
91+
| staticlocals__staticlocals_f3_extractor | false | 31496 | 31496 | (int)... |
92+
| staticlocals__staticlocals_f3_extractor | false | 31498 | 31498 | initializer for i |
93+
| staticlocals__staticlocals_f3_extractor | true | 31477 | 31480 | |
94+
| staticlocals__staticlocals_f3_extractor | true | 31480 | 31473 | |
95+
| staticlocals__staticlocals_f3_extractor | true | 31483 | 31477 | |
96+
| staticlocals__staticlocals_f3_ql | false | 31473 | 31473 | f3 |
97+
| staticlocals__staticlocals_f3_ql | false | 31477 | 31477 | declaration |
98+
| staticlocals__staticlocals_f3_ql | false | 31480 | 31480 | return ... |
99+
| staticlocals__staticlocals_f3_ql | false | 31483 | 31483 | { ... } |
100+
| staticlocals__staticlocals_f3_ql | false | 31492 | 31492 | value |
101+
| staticlocals__staticlocals_f3_ql | false | 31496 | 31496 | (int)... |
102+
| staticlocals__staticlocals_f3_ql | false | 31498 | 31498 | initializer for i |
103+
| staticlocals__staticlocals_f3_ql | true | 31477 | 31480 | |
104+
| staticlocals__staticlocals_f3_ql | true | 31477 | 31498 | |
105+
| staticlocals__staticlocals_f3_ql | true | 31480 | 31473 | |
106+
| staticlocals__staticlocals_f3_ql | true | 31483 | 31477 | |
107+
| staticlocals__staticlocals_f3_ql | true | 31492 | 31480 | |
108+
| staticlocals__staticlocals_f3_ql | true | 31498 | 31492 | |
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
| pointer_to_member__pmIsConstT | pointer_to_member.cpp:41:3:44:29 | declaration | pointer_to_member.cpp:44:11:44:28 | initializer for pms | Standard edge, only from QL | uninstantiated |
2+
| pointer_to_member__pmIsConstT | pointer_to_member.cpp:41:3:44:29 | declaration | pointer_to_member.cpp:45:1:45:1 | return ... | Standard edge, only from extractor | uninstantiated |
3+
| pointer_to_member__pmIsConstT | pointer_to_member.cpp:44:11:44:28 | initializer for pms | pointer_to_member.cpp:44:14:44:18 | x1 | Standard edge, only from QL | uninstantiated |
4+
| pointer_to_member__pmIsConstT | pointer_to_member.cpp:44:11:44:28 | {...} | pointer_to_member.cpp:45:1:45:1 | return ... | Standard edge, only from QL | uninstantiated |
5+
| pointer_to_member__pmIsConstT | pointer_to_member.cpp:44:13:44:18 | & ... | pointer_to_member.cpp:44:22:44:26 | f1 | Standard edge, only from QL | uninstantiated |
6+
| pointer_to_member__pmIsConstT | pointer_to_member.cpp:44:14:44:18 | x1 | pointer_to_member.cpp:44:13:44:18 | & ... | Standard edge, only from QL | uninstantiated |
7+
| pointer_to_member__pmIsConstT | pointer_to_member.cpp:44:21:44:26 | & ... | pointer_to_member.cpp:44:11:44:28 | {...} | Standard edge, only from QL | uninstantiated |
8+
| pointer_to_member__pmIsConstT | pointer_to_member.cpp:44:22:44:26 | f1 | pointer_to_member.cpp:44:21:44:26 | & ... | Standard edge, only from QL | uninstantiated |
19
| staticlocals__staticlocals_f2 | file://:0:0:0:0 | call to C | staticlocals.cpp:30:1:30:1 | return ... | Standard edge, only from QL | |
210
| staticlocals__staticlocals_f2 | file://:0:0:0:0 | initializer for c | file://:0:0:0:0 | call to C | Standard edge, only from QL | |
311
| staticlocals__staticlocals_f2 | staticlocals.cpp:29:5:29:17 | declaration | file://:0:0:0:0 | initializer for c | Standard edge, only from QL | |
12+
| staticlocals__staticlocals_f3 | staticlocals.cpp:39:3:39:34 | declaration | staticlocals.cpp:39:18:39:33 | initializer for i | Standard edge, only from QL | uninstantiated |
13+
| staticlocals__staticlocals_f3 | staticlocals.cpp:39:18:39:33 | initializer for i | staticlocals.cpp:39:18:39:33 | value | Standard edge, only from QL | uninstantiated |
14+
| staticlocals__staticlocals_f3 | staticlocals.cpp:39:18:39:33 | value | staticlocals.cpp:40:1:40:1 | return ... | Standard edge, only from QL | uninstantiated |

cpp/ql/test/library-tests/templates/instantiations_functions/elements.expected

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -317,8 +317,8 @@
317317
| test.cpp:19:9:19:24 | call to expression |
318318
| test.cpp:19:9:19:25 | ExprStmt |
319319
| test.cpp:19:9:19:25 | ExprStmt |
320-
| test.cpp:19:15:19:18 | Unknown literal |
321320
| test.cpp:19:15:19:18 | call to funx |
321+
| test.cpp:19:15:19:18 | funx |
322322
| test.cpp:19:20:19:23 | (reference to) |
323323
| test.cpp:19:20:19:23 | valx |
324324
| test.cpp:19:20:19:23 | valx |
@@ -356,8 +356,8 @@
356356
| test.cpp:30:13:30:22 | call to expression |
357357
| test.cpp:30:13:30:23 | ExprStmt |
358358
| test.cpp:30:13:30:23 | ExprStmt |
359-
| test.cpp:30:15:30:20 | Unknown literal |
360359
| test.cpp:30:15:30:20 | call to eparse |
360+
| test.cpp:30:15:30:20 | eparse |
361361
| test.cpp:31:9:31:9 | return ... |
362362
| test.cpp:31:9:31:9 | return ... |
363363
| test.cpp:34:6:34:11 | define |

0 commit comments

Comments
 (0)