Skip to content

Commit b4009ac

Browse files
owen-mcowen-mc
committed
Update test-kotlin2
1 parent e111d39 commit b4009ac

16 files changed

+924
-978
lines changed

‎java/ql/test-kotlin2/library-tests/controlflow/basic/bbStmts.expected‎

Lines changed: 85 additions & 85 deletions
Large diffs are not rendered by default.

‎java/ql/test-kotlin2/library-tests/controlflow/basic/bbStmts.ql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ import default
33
from BasicBlock b, int i, ControlFlowNode n
44
where
55
b.getNode(i) = n and
6-
b.getFile().(CompilationUnit).fromSource()
6+
b.getLocation().getFile().(CompilationUnit).fromSource()
77
select b, i, n

‎java/ql/test-kotlin2/library-tests/controlflow/basic/bbStrictDominance.expected‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,39 @@
1-
| Test.kt:4:13:79:2 | { ... } | Test.kt:4:2:79:2 | test |
1+
| Test.kt:4:13:79:2 | { ... } | Test.kt:4:2:79:2 | Exit |
2+
| Test.kt:4:13:79:2 | { ... } | Test.kt:11:3:16:3 | ... -> ... |
23
| Test.kt:4:13:79:2 | { ... } | Test.kt:11:14:14:3 | { ... } |
3-
| Test.kt:4:13:79:2 | { ... } | Test.kt:14:10:16:3 | ... -> ... |
4-
| Test.kt:4:13:79:2 | { ... } | Test.kt:18:3:18:7 | <Expr>; |
5-
| Test.kt:4:13:79:2 | { ... } | Test.kt:22:4:22:9 | <Expr>; |
6-
| Test.kt:4:13:79:2 | { ... } | Test.kt:24:4:24:9 | ... -> ... |
4+
| Test.kt:4:13:79:2 | { ... } | Test.kt:18:3:18:3 | <Expr>; |
5+
| Test.kt:4:13:79:2 | { ... } | Test.kt:21:3:24:9 | ... -> ... |
6+
| Test.kt:4:13:79:2 | { ... } | Test.kt:22:4:22:4 | <Expr>; |
77
| Test.kt:4:13:79:2 | { ... } | Test.kt:30:15:33:3 | { ... } |
8-
| Test.kt:4:13:79:2 | { ... } | Test.kt:35:3:35:8 | <Expr>; |
8+
| Test.kt:4:13:79:2 | { ... } | Test.kt:35:3:35:3 | <Expr>; |
99
| Test.kt:4:13:79:2 | { ... } | Test.kt:38:9:38:9 | x |
1010
| Test.kt:4:13:79:2 | { ... } | Test.kt:38:16:41:3 | { ... } |
11-
| Test.kt:4:13:79:2 | { ... } | Test.kt:43:3:43:8 | <Expr>; |
12-
| Test.kt:18:3:18:7 | <Expr>; | Test.kt:4:2:79:2 | test |
13-
| Test.kt:18:3:18:7 | <Expr>; | Test.kt:22:4:22:9 | <Expr>; |
14-
| Test.kt:18:3:18:7 | <Expr>; | Test.kt:24:4:24:9 | ... -> ... |
15-
| Test.kt:18:3:18:7 | <Expr>; | Test.kt:30:15:33:3 | { ... } |
16-
| Test.kt:18:3:18:7 | <Expr>; | Test.kt:35:3:35:8 | <Expr>; |
17-
| Test.kt:18:3:18:7 | <Expr>; | Test.kt:38:9:38:9 | x |
18-
| Test.kt:18:3:18:7 | <Expr>; | Test.kt:38:16:41:3 | { ... } |
19-
| Test.kt:18:3:18:7 | <Expr>; | Test.kt:43:3:43:8 | <Expr>; |
20-
| Test.kt:22:4:22:9 | <Expr>; | Test.kt:30:15:33:3 | { ... } |
21-
| Test.kt:22:4:22:9 | <Expr>; | Test.kt:35:3:35:8 | <Expr>; |
22-
| Test.kt:22:4:22:9 | <Expr>; | Test.kt:38:9:38:9 | x |
23-
| Test.kt:22:4:22:9 | <Expr>; | Test.kt:38:16:41:3 | { ... } |
24-
| Test.kt:22:4:22:9 | <Expr>; | Test.kt:43:3:43:8 | <Expr>; |
25-
| Test.kt:35:3:35:8 | <Expr>; | Test.kt:38:9:38:9 | x |
26-
| Test.kt:35:3:35:8 | <Expr>; | Test.kt:38:16:41:3 | { ... } |
27-
| Test.kt:35:3:35:8 | <Expr>; | Test.kt:43:3:43:8 | <Expr>; |
11+
| Test.kt:4:13:79:2 | { ... } | Test.kt:43:3:43:3 | <Expr>; |
12+
| Test.kt:18:3:18:3 | <Expr>; | Test.kt:4:2:79:2 | Exit |
13+
| Test.kt:18:3:18:3 | <Expr>; | Test.kt:21:3:24:9 | ... -> ... |
14+
| Test.kt:18:3:18:3 | <Expr>; | Test.kt:22:4:22:4 | <Expr>; |
15+
| Test.kt:18:3:18:3 | <Expr>; | Test.kt:30:15:33:3 | { ... } |
16+
| Test.kt:18:3:18:3 | <Expr>; | Test.kt:35:3:35:3 | <Expr>; |
17+
| Test.kt:18:3:18:3 | <Expr>; | Test.kt:38:9:38:9 | x |
18+
| Test.kt:18:3:18:3 | <Expr>; | Test.kt:38:16:41:3 | { ... } |
19+
| Test.kt:18:3:18:3 | <Expr>; | Test.kt:43:3:43:3 | <Expr>; |
20+
| Test.kt:22:4:22:4 | <Expr>; | Test.kt:30:15:33:3 | { ... } |
21+
| Test.kt:22:4:22:4 | <Expr>; | Test.kt:35:3:35:3 | <Expr>; |
22+
| Test.kt:22:4:22:4 | <Expr>; | Test.kt:38:9:38:9 | x |
23+
| Test.kt:22:4:22:4 | <Expr>; | Test.kt:38:16:41:3 | { ... } |
24+
| Test.kt:22:4:22:4 | <Expr>; | Test.kt:43:3:43:3 | <Expr>; |
25+
| Test.kt:35:3:35:3 | <Expr>; | Test.kt:38:9:38:9 | x |
26+
| Test.kt:35:3:35:3 | <Expr>; | Test.kt:38:16:41:3 | { ... } |
27+
| Test.kt:35:3:35:3 | <Expr>; | Test.kt:43:3:43:3 | <Expr>; |
2828
| Test.kt:38:9:38:9 | x | Test.kt:38:16:41:3 | { ... } |
29-
| Test.kt:38:9:38:9 | x | Test.kt:43:3:43:8 | <Expr>; |
30-
| Test.kt:82:21:89:1 | { ... } | Test.kt:82:1:89:1 | t1 |
31-
| Test.kt:82:21:89:1 | { ... } | Test.kt:84:3:84:18 | x |
29+
| Test.kt:38:9:38:9 | x | Test.kt:43:3:43:3 | <Expr>; |
30+
| Test.kt:82:21:89:1 | { ... } | Test.kt:82:1:89:1 | Exit |
31+
| Test.kt:82:21:89:1 | { ... } | Test.kt:84:7:84:7 | x |
3232
| Test.kt:82:21:89:1 | { ... } | Test.kt:86:4:88:2 | catch (...) |
33-
| Test.kt:91:22:98:1 | { ... } | Test.kt:91:1:98:1 | t2 |
34-
| Test.kt:91:22:98:1 | { ... } | Test.kt:93:3:93:13 | x |
33+
| Test.kt:91:22:98:1 | { ... } | Test.kt:91:1:98:1 | Exit |
34+
| Test.kt:91:22:98:1 | { ... } | Test.kt:93:7:93:7 | x |
3535
| Test.kt:91:22:98:1 | { ... } | Test.kt:95:4:97:2 | catch (...) |
36-
| Test.kt:100:25:110:1 | { ... } | Test.kt:100:1:110:1 | fn |
36+
| Test.kt:100:25:110:1 | { ... } | Test.kt:100:1:110:1 | Exit |
3737
| Test.kt:100:25:110:1 | { ... } | Test.kt:101:22:101:22 | y |
3838
| Test.kt:100:25:110:1 | { ... } | Test.kt:101:33:103:5 | { ... } |
3939
| Test.kt:100:25:110:1 | { ... } | Test.kt:105:5:109:5 | <Expr>; |
@@ -45,11 +45,11 @@
4545
| Test.kt:105:5:109:5 | <Expr>; | Test.kt:107:16:109:5 | ... -> ... |
4646
| Test.kt:105:5:109:5 | <Expr>; | Test.kt:107:27:109:5 | { ... } |
4747
| Test.kt:107:16:109:5 | ... -> ... | Test.kt:107:27:109:5 | { ... } |
48-
| Test.kt:112:32:116:1 | { ... } | Test.kt:112:1:116:1 | fn |
48+
| Test.kt:112:32:116:1 | { ... } | Test.kt:112:1:116:1 | Exit |
4949
| Test.kt:112:32:116:1 | { ... } | Test.kt:113:14:113:14 | y |
5050
| Test.kt:112:32:116:1 | { ... } | Test.kt:113:17:115:5 | { ... } |
5151
| Test.kt:113:14:113:14 | y | Test.kt:113:17:115:5 | { ... } |
52-
| Test.kt:118:37:124:1 | { ... } | Test.kt:118:1:124:1 | fn_when |
52+
| Test.kt:118:37:124:1 | { ... } | Test.kt:118:1:124:1 | Exit |
5353
| Test.kt:118:37:124:1 | { ... } | Test.kt:121:9:121:9 | <Expr>; |
5454
| Test.kt:118:37:124:1 | { ... } | Test.kt:122:12:122:16 | ... -> ... |
5555
| Test.kt:118:37:124:1 | { ... } | Test.kt:123:8:123:10 | { ... } |

‎java/ql/test-kotlin2/library-tests/controlflow/basic/bbSuccessor.expected‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,45 @@
1+
| Test.kt:4:13:79:2 | { ... } | Test.kt:11:3:16:3 | ... -> ... |
12
| Test.kt:4:13:79:2 | { ... } | Test.kt:11:14:14:3 | { ... } |
2-
| Test.kt:4:13:79:2 | { ... } | Test.kt:14:10:16:3 | ... -> ... |
3-
| Test.kt:11:14:14:3 | { ... } | Test.kt:18:3:18:7 | <Expr>; |
4-
| Test.kt:14:10:16:3 | ... -> ... | Test.kt:18:3:18:7 | <Expr>; |
5-
| Test.kt:18:3:18:7 | <Expr>; | Test.kt:22:4:22:9 | <Expr>; |
6-
| Test.kt:18:3:18:7 | <Expr>; | Test.kt:24:4:24:9 | ... -> ... |
7-
| Test.kt:22:4:22:9 | <Expr>; | Test.kt:30:15:33:3 | { ... } |
8-
| Test.kt:22:4:22:9 | <Expr>; | Test.kt:35:3:35:8 | <Expr>; |
9-
| Test.kt:24:4:24:9 | ... -> ... | Test.kt:4:2:79:2 | test |
10-
| Test.kt:30:15:33:3 | { ... } | Test.kt:35:3:35:8 | <Expr>; |
11-
| Test.kt:35:3:35:8 | <Expr>; | Test.kt:38:9:38:9 | x |
3+
| Test.kt:11:3:16:3 | ... -> ... | Test.kt:18:3:18:3 | <Expr>; |
4+
| Test.kt:11:14:14:3 | { ... } | Test.kt:18:3:18:3 | <Expr>; |
5+
| Test.kt:18:3:18:3 | <Expr>; | Test.kt:21:3:24:9 | ... -> ... |
6+
| Test.kt:18:3:18:3 | <Expr>; | Test.kt:22:4:22:4 | <Expr>; |
7+
| Test.kt:21:3:24:9 | ... -> ... | Test.kt:4:2:79:2 | Exit |
8+
| Test.kt:22:4:22:4 | <Expr>; | Test.kt:30:15:33:3 | { ... } |
9+
| Test.kt:22:4:22:4 | <Expr>; | Test.kt:35:3:35:3 | <Expr>; |
10+
| Test.kt:30:15:33:3 | { ... } | Test.kt:35:3:35:3 | <Expr>; |
11+
| Test.kt:35:3:35:3 | <Expr>; | Test.kt:38:9:38:9 | x |
1212
| Test.kt:38:9:38:9 | x | Test.kt:38:16:41:3 | { ... } |
13-
| Test.kt:38:9:38:9 | x | Test.kt:43:3:43:8 | <Expr>; |
13+
| Test.kt:38:9:38:9 | x | Test.kt:43:3:43:3 | <Expr>; |
1414
| Test.kt:38:16:41:3 | { ... } | Test.kt:38:9:38:9 | x |
15-
| Test.kt:43:3:43:8 | <Expr>; | Test.kt:4:2:79:2 | test |
16-
| Test.kt:82:21:89:1 | { ... } | Test.kt:84:3:84:18 | x |
15+
| Test.kt:43:3:43:3 | <Expr>; | Test.kt:4:2:79:2 | Exit |
16+
| Test.kt:82:21:89:1 | { ... } | Test.kt:84:7:84:7 | x |
1717
| Test.kt:82:21:89:1 | { ... } | Test.kt:86:4:88:2 | catch (...) |
18-
| Test.kt:84:3:84:18 | x | Test.kt:82:1:89:1 | t1 |
19-
| Test.kt:86:4:88:2 | catch (...) | Test.kt:82:1:89:1 | t1 |
20-
| Test.kt:91:22:98:1 | { ... } | Test.kt:93:3:93:13 | x |
18+
| Test.kt:84:7:84:7 | x | Test.kt:82:1:89:1 | Exit |
19+
| Test.kt:86:4:88:2 | catch (...) | Test.kt:82:1:89:1 | Exit |
20+
| Test.kt:91:22:98:1 | { ... } | Test.kt:93:7:93:7 | x |
2121
| Test.kt:91:22:98:1 | { ... } | Test.kt:95:4:97:2 | catch (...) |
22-
| Test.kt:93:3:93:13 | x | Test.kt:91:1:98:1 | t2 |
23-
| Test.kt:95:4:97:2 | catch (...) | Test.kt:91:1:98:1 | t2 |
22+
| Test.kt:93:7:93:7 | x | Test.kt:91:1:98:1 | Exit |
23+
| Test.kt:95:4:97:2 | catch (...) | Test.kt:91:1:98:1 | Exit |
2424
| Test.kt:100:25:110:1 | { ... } | Test.kt:101:22:101:22 | y |
2525
| Test.kt:100:25:110:1 | { ... } | Test.kt:105:5:109:5 | <Expr>; |
2626
| Test.kt:101:22:101:22 | y | Test.kt:101:33:103:5 | { ... } |
2727
| Test.kt:101:22:101:22 | y | Test.kt:105:5:109:5 | <Expr>; |
28-
| Test.kt:101:33:103:5 | { ... } | Test.kt:100:1:110:1 | fn |
28+
| Test.kt:101:33:103:5 | { ... } | Test.kt:100:1:110:1 | Exit |
2929
| Test.kt:105:5:109:5 | <Expr>; | Test.kt:105:20:107:5 | { ... } |
3030
| Test.kt:105:5:109:5 | <Expr>; | Test.kt:107:16:109:5 | ... -> ... |
31-
| Test.kt:105:20:107:5 | { ... } | Test.kt:100:1:110:1 | fn |
32-
| Test.kt:107:16:109:5 | ... -> ... | Test.kt:100:1:110:1 | fn |
31+
| Test.kt:105:20:107:5 | { ... } | Test.kt:100:1:110:1 | Exit |
32+
| Test.kt:107:16:109:5 | ... -> ... | Test.kt:100:1:110:1 | Exit |
3333
| Test.kt:107:16:109:5 | ... -> ... | Test.kt:107:27:109:5 | { ... } |
34-
| Test.kt:107:27:109:5 | { ... } | Test.kt:100:1:110:1 | fn |
35-
| Test.kt:112:32:116:1 | { ... } | Test.kt:112:1:116:1 | fn |
34+
| Test.kt:107:27:109:5 | { ... } | Test.kt:100:1:110:1 | Exit |
35+
| Test.kt:112:32:116:1 | { ... } | Test.kt:112:1:116:1 | Exit |
3636
| Test.kt:112:32:116:1 | { ... } | Test.kt:113:14:113:14 | y |
37-
| Test.kt:113:14:113:14 | y | Test.kt:112:1:116:1 | fn |
37+
| Test.kt:113:14:113:14 | y | Test.kt:112:1:116:1 | Exit |
3838
| Test.kt:113:14:113:14 | y | Test.kt:113:17:115:5 | { ... } |
39-
| Test.kt:113:17:115:5 | { ... } | Test.kt:112:1:116:1 | fn |
39+
| Test.kt:113:17:115:5 | { ... } | Test.kt:112:1:116:1 | Exit |
4040
| Test.kt:118:37:124:1 | { ... } | Test.kt:121:9:121:9 | <Expr>; |
4141
| Test.kt:118:37:124:1 | { ... } | Test.kt:122:12:122:16 | ... -> ... |
42-
| Test.kt:121:9:121:9 | <Expr>; | Test.kt:118:1:124:1 | fn_when |
42+
| Test.kt:121:9:121:9 | <Expr>; | Test.kt:118:1:124:1 | Exit |
4343
| Test.kt:121:9:121:9 | <Expr>; | Test.kt:123:8:123:10 | { ... } |
44-
| Test.kt:122:12:122:16 | ... -> ... | Test.kt:118:1:124:1 | fn_when |
45-
| Test.kt:123:8:123:10 | { ... } | Test.kt:118:1:124:1 | fn_when |
44+
| Test.kt:122:12:122:16 | ... -> ... | Test.kt:118:1:124:1 | Exit |
45+
| Test.kt:123:8:123:10 | { ... } | Test.kt:118:1:124:1 | Exit |

0 commit comments

Comments
 (0)