Skip to content

Commit 91e26d0

Browse files
hvitvedhvitved
committed
Rust: Add another variable test
1 parent a172063 commit 91e26d0

File tree

3 files changed

+66
-46
lines changed

3 files changed

+66
-46
lines changed

‎rust/ql/test/library-tests/variables/CONSISTENCY/CfgConsistency.expected‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ deadEnd
22
| variables.rs:2:5:2:22 | ExprStmt |
33
| variables.rs:6:5:6:22 | ExprStmt |
44
| variables.rs:200:16:200:21 | ... > ... |
5-
| variables.rs:295:5:295:42 | LetStmt |
5+
| variables.rs:310:5:310:42 | LetStmt |

‎rust/ql/test/library-tests/variables/variables.expected‎

Lines changed: 49 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -46,23 +46,25 @@ variable
4646
| variables.rs:210:13:210:13 | e |
4747
| variables.rs:211:14:211:51 | a11 |
4848
| variables.rs:214:33:214:35 | a12 |
49-
| variables.rs:224:5:224:6 | a8 |
50-
| variables.rs:226:9:226:10 | b3 |
51-
| variables.rs:227:9:227:10 | c1 |
52-
| variables.rs:235:6:235:41 | a9 |
53-
| variables.rs:242:13:242:15 | a10 |
54-
| variables.rs:243:13:243:14 | b4 |
55-
| variables.rs:244:13:244:14 | c2 |
56-
| variables.rs:265:13:265:15 | a10 |
57-
| variables.rs:266:13:266:14 | b4 |
58-
| variables.rs:278:9:278:23 | example_closure |
59-
| variables.rs:279:10:279:10 | x |
60-
| variables.rs:281:9:281:10 | n1 |
61-
| variables.rs:286:9:286:26 | immutable_variable |
62-
| variables.rs:287:10:287:10 | x |
63-
| variables.rs:289:9:289:10 | n2 |
64-
| variables.rs:295:9:295:9 | v |
65-
| variables.rs:297:9:297:12 | text |
49+
| variables.rs:231:9:231:10 | fv |
50+
| variables.rs:233:9:233:109 | a13 |
51+
| variables.rs:239:5:239:6 | a8 |
52+
| variables.rs:241:9:241:10 | b3 |
53+
| variables.rs:242:9:242:10 | c1 |
54+
| variables.rs:250:6:250:41 | a9 |
55+
| variables.rs:257:13:257:15 | a10 |
56+
| variables.rs:258:13:258:14 | b4 |
57+
| variables.rs:259:13:259:14 | c2 |
58+
| variables.rs:280:13:280:15 | a10 |
59+
| variables.rs:281:13:281:14 | b4 |
60+
| variables.rs:293:9:293:23 | example_closure |
61+
| variables.rs:294:10:294:10 | x |
62+
| variables.rs:296:9:296:10 | n1 |
63+
| variables.rs:301:9:301:26 | immutable_variable |
64+
| variables.rs:302:10:302:10 | x |
65+
| variables.rs:304:9:304:10 | n2 |
66+
| variables.rs:310:9:310:9 | v |
67+
| variables.rs:312:9:312:12 | text |
6668
variableAccess
6769
| variables.rs:11:15:11:16 | x1 | variables.rs:10:9:10:10 | x1 |
6870
| variables.rs:16:15:16:16 | x2 | variables.rs:15:13:15:14 | x2 |
@@ -114,31 +116,33 @@ variableAccess
114116
| variables.rs:213:23:213:25 | a11 | variables.rs:211:14:211:51 | a11 |
115117
| variables.rs:215:15:215:15 | e | variables.rs:210:13:210:13 | e |
116118
| variables.rs:216:28:216:30 | a12 | variables.rs:214:33:214:35 | a12 |
117-
| variables.rs:229:15:229:16 | a8 | variables.rs:224:5:224:6 | a8 |
118-
| variables.rs:230:15:230:16 | b3 | variables.rs:226:9:226:10 | b3 |
119-
| variables.rs:231:15:231:16 | c1 | variables.rs:227:9:227:10 | c1 |
120-
| variables.rs:237:15:237:16 | a9 | variables.rs:235:6:235:41 | a9 |
121-
| variables.rs:246:15:246:17 | a10 | variables.rs:242:13:242:15 | a10 |
122-
| variables.rs:247:15:247:16 | b4 | variables.rs:243:13:243:14 | b4 |
123-
| variables.rs:248:15:248:16 | c2 | variables.rs:244:13:244:14 | c2 |
124-
| variables.rs:251:9:251:10 | c2 | variables.rs:244:13:244:14 | c2 |
125-
| variables.rs:252:9:252:10 | b4 | variables.rs:243:13:243:14 | b4 |
126-
| variables.rs:253:9:253:11 | a10 | variables.rs:242:13:242:15 | a10 |
127-
| variables.rs:255:9:255:11 | a10 | variables.rs:242:13:242:15 | a10 |
128-
| variables.rs:256:9:256:10 | b4 | variables.rs:243:13:243:14 | b4 |
129-
| variables.rs:257:9:257:10 | c2 | variables.rs:244:13:244:14 | c2 |
130-
| variables.rs:259:15:259:17 | a10 | variables.rs:242:13:242:15 | a10 |
131-
| variables.rs:260:15:260:16 | b4 | variables.rs:243:13:243:14 | b4 |
132-
| variables.rs:261:15:261:16 | c2 | variables.rs:244:13:244:14 | c2 |
133-
| variables.rs:268:23:268:25 | a10 | variables.rs:265:13:265:15 | a10 |
134-
| variables.rs:269:23:269:24 | b4 | variables.rs:266:13:266:14 | b4 |
135-
| variables.rs:273:15:273:17 | a10 | variables.rs:242:13:242:15 | a10 |
136-
| variables.rs:274:15:274:16 | b4 | variables.rs:243:13:243:14 | b4 |
137-
| variables.rs:280:9:280:9 | x | variables.rs:279:10:279:10 | x |
138-
| variables.rs:282:9:282:23 | example_closure | variables.rs:278:9:278:23 | example_closure |
139-
| variables.rs:283:15:283:16 | n1 | variables.rs:281:9:281:10 | n1 |
140-
| variables.rs:288:9:288:9 | x | variables.rs:287:10:287:10 | x |
141-
| variables.rs:290:9:290:26 | immutable_variable | variables.rs:286:9:286:26 | immutable_variable |
142-
| variables.rs:291:15:291:16 | n2 | variables.rs:289:9:289:10 | n2 |
143-
| variables.rs:298:12:298:12 | v | variables.rs:295:9:295:9 | v |
144-
| variables.rs:299:19:299:22 | text | variables.rs:297:9:297:12 | text |
119+
| variables.rs:232:11:232:12 | fv | variables.rs:231:9:231:10 | fv |
120+
| variables.rs:234:26:234:28 | a13 | variables.rs:233:9:233:109 | a13 |
121+
| variables.rs:244:15:244:16 | a8 | variables.rs:239:5:239:6 | a8 |
122+
| variables.rs:245:15:245:16 | b3 | variables.rs:241:9:241:10 | b3 |
123+
| variables.rs:246:15:246:16 | c1 | variables.rs:242:9:242:10 | c1 |
124+
| variables.rs:252:15:252:16 | a9 | variables.rs:250:6:250:41 | a9 |
125+
| variables.rs:261:15:261:17 | a10 | variables.rs:257:13:257:15 | a10 |
126+
| variables.rs:262:15:262:16 | b4 | variables.rs:258:13:258:14 | b4 |
127+
| variables.rs:263:15:263:16 | c2 | variables.rs:259:13:259:14 | c2 |
128+
| variables.rs:266:9:266:10 | c2 | variables.rs:259:13:259:14 | c2 |
129+
| variables.rs:267:9:267:10 | b4 | variables.rs:258:13:258:14 | b4 |
130+
| variables.rs:268:9:268:11 | a10 | variables.rs:257:13:257:15 | a10 |
131+
| variables.rs:270:9:270:11 | a10 | variables.rs:257:13:257:15 | a10 |
132+
| variables.rs:271:9:271:10 | b4 | variables.rs:258:13:258:14 | b4 |
133+
| variables.rs:272:9:272:10 | c2 | variables.rs:259:13:259:14 | c2 |
134+
| variables.rs:274:15:274:17 | a10 | variables.rs:257:13:257:15 | a10 |
135+
| variables.rs:275:15:275:16 | b4 | variables.rs:258:13:258:14 | b4 |
136+
| variables.rs:276:15:276:16 | c2 | variables.rs:259:13:259:14 | c2 |
137+
| variables.rs:283:23:283:25 | a10 | variables.rs:280:13:280:15 | a10 |
138+
| variables.rs:284:23:284:24 | b4 | variables.rs:281:13:281:14 | b4 |
139+
| variables.rs:288:15:288:17 | a10 | variables.rs:257:13:257:15 | a10 |
140+
| variables.rs:289:15:289:16 | b4 | variables.rs:258:13:258:14 | b4 |
141+
| variables.rs:295:9:295:9 | x | variables.rs:294:10:294:10 | x |
142+
| variables.rs:297:9:297:23 | example_closure | variables.rs:293:9:293:23 | example_closure |
143+
| variables.rs:298:15:298:16 | n1 | variables.rs:296:9:296:10 | n1 |
144+
| variables.rs:303:9:303:9 | x | variables.rs:302:10:302:10 | x |
145+
| variables.rs:305:9:305:26 | immutable_variable | variables.rs:301:9:301:26 | immutable_variable |
146+
| variables.rs:306:15:306:16 | n2 | variables.rs:304:9:304:10 | n2 |
147+
| variables.rs:313:12:313:12 | v | variables.rs:310:9:310:9 | v |
148+
| variables.rs:314:19:314:22 | text | variables.rs:312:9:312:12 | text |

‎rust/ql/test/library-tests/variables/variables.rs‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,21 @@ fn match_pattern8() {
220220
}
221221
}
222222

223+
enum FourValued {
224+
First(i64),
225+
Second(i64),
226+
Third(i64),
227+
Fourth(i64),
228+
}
229+
230+
fn match_pattern9() {
231+
let fv = FourValued::Second(62); // tv
232+
match fv { // $ access=tv
233+
FourValued::First(a13) | (FourValued::Second(a13) | FourValued::Third(a13)) | FourValued::Fourth(a13) // a13
234+
=> print_i64(a13), // $ access=a13
235+
}
236+
}
237+
223238
fn param_pattern1(
224239
a8: &str, // a8
225240
(
@@ -317,6 +332,7 @@ fn main() {
317332
match_pattern6();
318333
match_pattern7();
319334
match_pattern8();
335+
match_pattern9();
320336
param_pattern1("a", ("b", "c"));
321337
param_pattern2(Either::Left(45));
322338
destruct_assignment();

0 commit comments

Comments
 (0)