Skip to content

Commit 50acf72

Browse files
nickrolfenickrolfe
committed
C++: accept more extraction of functions in local classes/lambdas
1 parent 3ca8fdd commit 50acf72

File tree

3 files changed

+111
-93
lines changed

3 files changed

+111
-93
lines changed

‎cpp/ql/test/library-tests/lambdas/captures/elements.expected

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,11 +86,15 @@
8686
| end_pos.cpp:9:15:9:15 | (constructor) |
8787
| end_pos.cpp:9:15:9:15 | (constructor) |
8888
| end_pos.cpp:9:15:9:15 | (constructor) |
89+
| end_pos.cpp:9:15:9:15 | Unknown literal |
90+
| end_pos.cpp:9:15:9:15 | constructor init of field ii |
8991
| end_pos.cpp:9:15:9:15 | declaration of (null) |
9092
| end_pos.cpp:9:15:9:15 | definition of (null) |
9193
| end_pos.cpp:9:15:9:15 | definition of (null) |
9294
| end_pos.cpp:9:15:9:15 | definition of operator= |
9395
| end_pos.cpp:9:15:9:15 | operator= |
96+
| end_pos.cpp:9:15:9:15 | return ... |
97+
| end_pos.cpp:9:15:9:15 | { ... } |
9498
| end_pos.cpp:9:15:11:5 | [...](...){...} |
9599
| end_pos.cpp:9:15:11:5 | {...} |
96100
| end_pos.cpp:9:17:9:17 | definition of ii |

‎cpp/ql/test/library-tests/lambdas/cfg/cfg.expected

Lines changed: 103 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -1,93 +1,103 @@
1-
| <no scope> | false | 160 | 160 | operator() |
2-
| <no scope> | false | 166 | 166 | declaration |
3-
| <no scope> | false | 168 | 168 | call to printf |
4-
| <no scope> | false | 172 | 172 | Running with %d and %d\n |
5-
| <no scope> | false | 173 | 173 | array to pointer conversion |
6-
| <no scope> | false | 175 | 175 | (char *)... |
7-
| <no scope> | false | 177 | 177 | x |
8-
| <no scope> | false | 179 | 179 | y |
9-
| <no scope> | false | 181 | 181 | ExprStmt |
10-
| <no scope> | false | 183 | 183 | z |
11-
| <no scope> | false | 185 | 185 | x |
12-
| <no scope> | false | 187 | 187 | y |
13-
| <no scope> | false | 189 | 189 | ... + ... |
14-
| <no scope> | false | 191 | 191 | ... = ... |
15-
| <no scope> | false | 193 | 193 | ExprStmt |
16-
| <no scope> | false | 195 | 195 | call to printf |
17-
| <no scope> | false | 199 | 199 | Returning %d %d\n |
18-
| <no scope> | false | 200 | 200 | array to pointer conversion |
19-
| <no scope> | false | 202 | 202 | (char *)... |
20-
| <no scope> | false | 204 | 204 | z |
21-
| <no scope> | false | 206 | 206 | z |
22-
| <no scope> | false | 208 | 208 | ExprStmt |
23-
| <no scope> | false | 210 | 210 | z |
24-
| <no scope> | false | 212 | 212 | return ... |
25-
| <no scope> | false | 214 | 214 | { ... } |
26-
| <no scope> | false | 216 | 216 | operator auto (*)(int, int)->int |
27-
| <no scope> | false | 219 | 219 | (constructor) |
28-
| <no scope> | false | 223 | 223 | (constructor) |
29-
| <no scope> | false | 225 | 225 | operator= |
30-
| <no scope> | false | 227 | 227 | (constructor) |
31-
| <no scope> | false | 228 | 228 | _FUN |
32-
| <no scope> | true | 166 | 181 | |
33-
| <no scope> | true | 168 | 193 | |
34-
| <no scope> | true | 172 | 177 | |
35-
| <no scope> | true | 177 | 179 | |
36-
| <no scope> | true | 179 | 168 | |
37-
| <no scope> | true | 181 | 172 | |
38-
| <no scope> | true | 183 | 191 | |
39-
| <no scope> | true | 185 | 187 | |
40-
| <no scope> | true | 187 | 189 | |
41-
| <no scope> | true | 189 | 183 | |
42-
| <no scope> | true | 191 | 208 | |
43-
| <no scope> | true | 193 | 185 | |
44-
| <no scope> | true | 195 | 212 | |
45-
| <no scope> | true | 199 | 204 | |
46-
| <no scope> | true | 204 | 206 | |
47-
| <no scope> | true | 206 | 195 | |
48-
| <no scope> | true | 208 | 199 | |
49-
| <no scope> | true | 210 | 160 | |
50-
| <no scope> | true | 212 | 210 | |
51-
| <no scope> | true | 214 | 166 | |
52-
| __va_list_tag::operator= | false | 61 | 61 | operator= |
53-
| __va_list_tag::operator= | false | 65 | 65 | operator= |
54-
| main | false | 153 | 153 | main |
55-
| main | false | 251 | 251 | [...](...){...} |
56-
| main | false | 253 | 253 | initializer for myLambda |
57-
| main | false | 257 | 257 | declaration |
58-
| main | false | 259 | 259 | call to printf |
59-
| main | false | 265 | 265 | Some results: %d %d\n |
60-
| main | false | 266 | 266 | array to pointer conversion |
61-
| main | false | 268 | 268 | (char *)... |
62-
| main | false | 272 | 272 | call to operator() |
63-
| main | false | 274 | 274 | myLambda |
64-
| main | false | 276 | 276 | (const lambda [] type at line 12, col. 21)... |
65-
| main | false | 280 | 280 | 5 |
66-
| main | false | 283 | 283 | 6 |
67-
| main | false | 284 | 284 | call to operator() |
68-
| main | false | 286 | 286 | myLambda |
69-
| main | false | 288 | 288 | (const lambda [] type at line 12, col. 21)... |
70-
| main | false | 292 | 292 | 7 |
71-
| main | false | 295 | 295 | 8 |
72-
| main | false | 296 | 296 | ExprStmt |
73-
| main | false | 300 | 300 | 0 |
74-
| main | false | 301 | 301 | return ... |
75-
| main | false | 303 | 303 | { ... } |
76-
| main | true | 251 | 296 | |
77-
| main | true | 253 | 251 | |
78-
| main | true | 257 | 253 | |
79-
| main | true | 259 | 301 | |
80-
| main | true | 265 | 280 | |
81-
| main | true | 272 | 292 | |
82-
| main | true | 274 | 272 | |
83-
| main | true | 280 | 283 | |
84-
| main | true | 283 | 274 | |
85-
| main | true | 284 | 259 | |
86-
| main | true | 286 | 284 | |
87-
| main | true | 292 | 295 | |
88-
| main | true | 295 | 286 | |
89-
| main | true | 296 | 265 | |
90-
| main | true | 300 | 153 | |
91-
| main | true | 301 | 300 | |
92-
| main | true | 303 | 257 | |
93-
| printf | false | 138 | 138 | printf |
1+
| <no scope> | false | 102 | 102 | operator() |
2+
| <no scope> | false | 108 | 108 | declaration |
3+
| <no scope> | false | 110 | 110 | call to printf |
4+
| <no scope> | false | 114 | 114 | Running with %d and %d\n |
5+
| <no scope> | false | 115 | 115 | array to pointer conversion |
6+
| <no scope> | false | 117 | 117 | (char *)... |
7+
| <no scope> | false | 119 | 119 | x |
8+
| <no scope> | false | 121 | 121 | y |
9+
| <no scope> | false | 123 | 123 | ExprStmt |
10+
| <no scope> | false | 125 | 125 | z |
11+
| <no scope> | false | 127 | 127 | x |
12+
| <no scope> | false | 129 | 129 | y |
13+
| <no scope> | false | 131 | 131 | ... + ... |
14+
| <no scope> | false | 133 | 133 | ... = ... |
15+
| <no scope> | false | 135 | 135 | ExprStmt |
16+
| <no scope> | false | 137 | 137 | call to printf |
17+
| <no scope> | false | 141 | 141 | Returning %d %d\n |
18+
| <no scope> | false | 142 | 142 | array to pointer conversion |
19+
| <no scope> | false | 144 | 144 | (char *)... |
20+
| <no scope> | false | 146 | 146 | z |
21+
| <no scope> | false | 148 | 148 | z |
22+
| <no scope> | false | 150 | 150 | ExprStmt |
23+
| <no scope> | false | 152 | 152 | z |
24+
| <no scope> | false | 154 | 154 | return ... |
25+
| <no scope> | false | 156 | 156 | { ... } |
26+
| <no scope> | false | 160 | 160 | operator auto (*)(int, int)->int |
27+
| <no scope> | false | 161 | 161 | _FUN |
28+
| <no scope> | false | 164 | 164 | _FUN |
29+
| <no scope> | false | 166 | 166 | return ... |
30+
| <no scope> | false | 168 | 168 | { ... } |
31+
| <no scope> | false | 173 | 173 | (constructor) |
32+
| <no scope> | false | 175 | 175 | return ... |
33+
| <no scope> | false | 177 | 177 | { ... } |
34+
| <no scope> | false | 183 | 183 | (constructor) |
35+
| <no scope> | false | 186 | 186 | operator= |
36+
| <no scope> | false | 188 | 188 | (constructor) |
37+
| <no scope> | true | 108 | 123 | |
38+
| <no scope> | true | 110 | 135 | |
39+
| <no scope> | true | 114 | 119 | |
40+
| <no scope> | true | 119 | 121 | |
41+
| <no scope> | true | 121 | 110 | |
42+
| <no scope> | true | 123 | 114 | |
43+
| <no scope> | true | 125 | 133 | |
44+
| <no scope> | true | 127 | 129 | |
45+
| <no scope> | true | 129 | 131 | |
46+
| <no scope> | true | 131 | 125 | |
47+
| <no scope> | true | 133 | 150 | |
48+
| <no scope> | true | 135 | 127 | |
49+
| <no scope> | true | 137 | 154 | |
50+
| <no scope> | true | 141 | 146 | |
51+
| <no scope> | true | 146 | 148 | |
52+
| <no scope> | true | 148 | 137 | |
53+
| <no scope> | true | 150 | 141 | |
54+
| <no scope> | true | 152 | 102 | |
55+
| <no scope> | true | 154 | 152 | |
56+
| <no scope> | true | 156 | 108 | |
57+
| <no scope> | true | 164 | 160 | |
58+
| <no scope> | true | 166 | 164 | |
59+
| <no scope> | true | 168 | 166 | |
60+
| <no scope> | true | 175 | 173 | |
61+
| <no scope> | true | 177 | 175 | |
62+
| __va_list_tag::operator= | false | 60 | 60 | operator= |
63+
| __va_list_tag::operator= | false | 66 | 66 | operator= |
64+
| main | false | 95 | 95 | main |
65+
| main | false | 199 | 199 | [...](...){...} |
66+
| main | false | 201 | 201 | initializer for myLambda |
67+
| main | false | 205 | 205 | declaration |
68+
| main | false | 207 | 207 | call to printf |
69+
| main | false | 213 | 213 | Some results: %d %d\n |
70+
| main | false | 214 | 214 | array to pointer conversion |
71+
| main | false | 216 | 216 | (char *)... |
72+
| main | false | 220 | 220 | call to operator() |
73+
| main | false | 222 | 222 | myLambda |
74+
| main | false | 224 | 224 | (const lambda [] type at line 12, col. 21)... |
75+
| main | false | 228 | 228 | 5 |
76+
| main | false | 231 | 231 | 6 |
77+
| main | false | 232 | 232 | call to operator() |
78+
| main | false | 234 | 234 | myLambda |
79+
| main | false | 236 | 236 | (const lambda [] type at line 12, col. 21)... |
80+
| main | false | 240 | 240 | 7 |
81+
| main | false | 243 | 243 | 8 |
82+
| main | false | 244 | 244 | ExprStmt |
83+
| main | false | 248 | 248 | 0 |
84+
| main | false | 249 | 249 | return ... |
85+
| main | false | 251 | 251 | { ... } |
86+
| main | true | 199 | 244 | |
87+
| main | true | 201 | 199 | |
88+
| main | true | 205 | 201 | |
89+
| main | true | 207 | 249 | |
90+
| main | true | 213 | 228 | |
91+
| main | true | 220 | 240 | |
92+
| main | true | 222 | 220 | |
93+
| main | true | 228 | 231 | |
94+
| main | true | 231 | 222 | |
95+
| main | true | 232 | 207 | |
96+
| main | true | 234 | 232 | |
97+
| main | true | 240 | 243 | |
98+
| main | true | 243 | 234 | |
99+
| main | true | 244 | 213 | |
100+
| main | true | 248 | 95 | |
101+
| main | true | 249 | 248 | |
102+
| main | true | 251 | 205 | |
103+
| printf | false | 84 | 84 | printf |

‎cpp/ql/test/library-tests/lambdas/cfg/stmts.expected

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
1+
| file://:0:0:0:0 | { ... } | lambda_cfg.cpp:12:24:12:24 | operator auto (*)(int, int)->int |
12
| lambda_cfg.cpp:11:16:23:1 | { ... } | lambda_cfg.cpp:11:5:11:8 | main |
23
| lambda_cfg.cpp:12:5:18:6 | declaration | lambda_cfg.cpp:11:5:11:8 | main |
4+
| lambda_cfg.cpp:12:21:12:21 | return ... | lambda_cfg.cpp:12:21:12:21 | (constructor) |
5+
| lambda_cfg.cpp:12:21:12:21 | { ... } | lambda_cfg.cpp:12:21:12:21 | (constructor) |
6+
| lambda_cfg.cpp:12:24:12:24 | return ... | lambda_cfg.cpp:12:24:12:24 | operator auto (*)(int, int)->int |
37
| lambda_cfg.cpp:12:46:18:5 | { ... } | lambda_cfg.cpp:12:24:12:24 | operator() |
48
| lambda_cfg.cpp:13:9:13:14 | declaration | lambda_cfg.cpp:12:24:12:24 | operator() |
59
| lambda_cfg.cpp:14:9:14:49 | ExprStmt | lambda_cfg.cpp:12:24:12:24 | operator() |

0 commit comments

Comments
 (0)