Skip to content

Commit 92009f5

Browse files
igfooigfoo
authored
Merge pull request github#15640 from igfoo/igfoo/controlflow
Kotlin 2: Accept changes in library-tests/controlflow/basic
2 parents f0f1b04 + a5a6020 commit 92009f5

File tree

6 files changed

+210
-252
lines changed

6 files changed

+210
-252
lines changed

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

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
| Test.kt:4:13:79:2 | { ... } | 12 | Test.kt:8:3:8:16 | w |
1919
| Test.kt:4:13:79:2 | { ... } | 13 | Test.kt:11:3:16:3 | <Expr>; |
2020
| Test.kt:4:13:79:2 | { ... } | 14 | Test.kt:11:3:16:3 | when ... |
21-
| Test.kt:4:13:79:2 | { ... } | 15 | Test.kt:11:7:11:11 | ... -> ... |
21+
| Test.kt:4:13:79:2 | { ... } | 15 | Test.kt:11:7:14:3 | ... -> ... |
2222
| Test.kt:4:13:79:2 | { ... } | 16 | Test.kt:11:7:11:7 | x |
2323
| Test.kt:4:13:79:2 | { ... } | 17 | Test.kt:11:11:11:11 | 0 |
2424
| Test.kt:4:13:79:2 | { ... } | 18 | Test.kt:11:7:11:11 | ... > ... |
@@ -40,23 +40,22 @@
4040
| Test.kt:18:3:18:7 | <Expr>; | 2 | Test.kt:18:3:18:7 | ...=... |
4141
| Test.kt:18:3:18:7 | <Expr>; | 3 | Test.kt:21:3:24:9 | <Expr>; |
4242
| Test.kt:18:3:18:7 | <Expr>; | 4 | Test.kt:21:3:24:9 | when ... |
43-
| Test.kt:18:3:18:7 | <Expr>; | 5 | Test.kt:21:6:21:10 | ... -> ... |
43+
| Test.kt:18:3:18:7 | <Expr>; | 5 | Test.kt:21:6:22:9 | ... -> ... |
4444
| Test.kt:18:3:18:7 | <Expr>; | 6 | Test.kt:21:6:21:6 | x |
4545
| Test.kt:18:3:18:7 | <Expr>; | 7 | Test.kt:21:10:21:10 | 0 |
4646
| Test.kt:18:3:18:7 | <Expr>; | 8 | Test.kt:21:6:21:10 | ... < ... |
47-
| Test.kt:22:4:22:9 | { ... } | 0 | Test.kt:22:4:22:9 | { ... } |
48-
| Test.kt:22:4:22:9 | { ... } | 1 | Test.kt:22:4:22:9 | <Expr>; |
49-
| Test.kt:22:4:22:9 | { ... } | 2 | Test.kt:22:8:22:9 | 40 |
50-
| Test.kt:22:4:22:9 | { ... } | 3 | Test.kt:22:4:22:9 | ...=... |
51-
| Test.kt:22:4:22:9 | { ... } | 4 | Test.kt:27:3:27:8 | <Expr>; |
52-
| Test.kt:22:4:22:9 | { ... } | 5 | Test.kt:27:7:27:8 | 10 |
53-
| Test.kt:22:4:22:9 | { ... } | 6 | Test.kt:27:3:27:8 | ...=... |
54-
| Test.kt:22:4:22:9 | { ... } | 7 | Test.kt:30:3:33:3 | <Expr>; |
55-
| Test.kt:22:4:22:9 | { ... } | 8 | Test.kt:30:3:33:3 | when ... |
56-
| Test.kt:22:4:22:9 | { ... } | 9 | Test.kt:30:7:30:12 | ... -> ... |
57-
| Test.kt:22:4:22:9 | { ... } | 10 | Test.kt:30:7:30:7 | x |
58-
| Test.kt:22:4:22:9 | { ... } | 11 | Test.kt:30:12:30:12 | 0 |
59-
| Test.kt:22:4:22:9 | { ... } | 12 | Test.kt:30:7:30:12 | ... (value equals) ... |
47+
| Test.kt:22:4:22:9 | <Expr>; | 0 | Test.kt:22:4:22:9 | <Expr>; |
48+
| Test.kt:22:4:22:9 | <Expr>; | 1 | Test.kt:22:8:22:9 | 40 |
49+
| Test.kt:22:4:22:9 | <Expr>; | 2 | Test.kt:22:4:22:9 | ...=... |
50+
| Test.kt:22:4:22:9 | <Expr>; | 3 | Test.kt:27:3:27:8 | <Expr>; |
51+
| Test.kt:22:4:22:9 | <Expr>; | 4 | Test.kt:27:7:27:8 | 10 |
52+
| Test.kt:22:4:22:9 | <Expr>; | 5 | Test.kt:27:3:27:8 | ...=... |
53+
| Test.kt:22:4:22:9 | <Expr>; | 6 | Test.kt:30:3:33:3 | <Expr>; |
54+
| Test.kt:22:4:22:9 | <Expr>; | 7 | Test.kt:30:3:33:3 | when ... |
55+
| Test.kt:22:4:22:9 | <Expr>; | 8 | Test.kt:30:7:33:3 | ... -> ... |
56+
| Test.kt:22:4:22:9 | <Expr>; | 9 | Test.kt:30:7:30:7 | x |
57+
| Test.kt:22:4:22:9 | <Expr>; | 10 | Test.kt:30:12:30:12 | 0 |
58+
| Test.kt:22:4:22:9 | <Expr>; | 11 | Test.kt:30:7:30:12 | ... (value equals) ... |
6059
| Test.kt:24:4:24:9 | ... -> ... | 0 | Test.kt:24:4:24:9 | ... -> ... |
6160
| Test.kt:24:4:24:9 | ... -> ... | 1 | Test.kt:24:4:24:9 | true |
6261
| Test.kt:24:4:24:9 | ... -> ... | 2 | Test.kt:24:10:24:10 | INSTANCE |
@@ -137,7 +136,7 @@
137136
| Test.kt:100:25:110:1 | { ... } | 0 | Test.kt:100:25:110:1 | { ... } |
138137
| Test.kt:100:25:110:1 | { ... } | 1 | Test.kt:101:5:103:5 | <Expr>; |
139138
| Test.kt:100:25:110:1 | { ... } | 2 | Test.kt:101:5:103:5 | when ... |
140-
| Test.kt:100:25:110:1 | { ... } | 3 | Test.kt:101:9:101:30 | ... -> ... |
139+
| Test.kt:100:25:110:1 | { ... } | 3 | Test.kt:101:9:103:5 | ... -> ... |
141140
| Test.kt:100:25:110:1 | { ... } | 4 | Test.kt:101:9:101:30 | ... && ... |
142141
| Test.kt:100:25:110:1 | { ... } | 5 | Test.kt:101:9:101:9 | x |
143142
| Test.kt:100:25:110:1 | { ... } | 6 | Test.kt:101:14:101:17 | null |
@@ -150,18 +149,18 @@
150149
| Test.kt:101:33:103:5 | { ... } | 2 | Test.kt:102:9:102:25 | throw ... |
151150
| Test.kt:105:5:109:5 | <Expr>; | 0 | Test.kt:105:5:109:5 | <Expr>; |
152151
| Test.kt:105:5:109:5 | <Expr>; | 1 | Test.kt:105:5:109:5 | when ... |
153-
| Test.kt:105:5:109:5 | <Expr>; | 2 | Test.kt:105:9:105:17 | ... -> ... |
152+
| Test.kt:105:5:109:5 | <Expr>; | 2 | Test.kt:105:9:107:5 | ... -> ... |
154153
| Test.kt:105:5:109:5 | <Expr>; | 3 | Test.kt:105:9:105:9 | x |
155154
| Test.kt:105:5:109:5 | <Expr>; | 4 | Test.kt:105:14:105:17 | null |
156155
| Test.kt:105:5:109:5 | <Expr>; | 5 | Test.kt:105:9:105:17 | ... (value not-equals) ... |
157156
| Test.kt:105:20:107:5 | { ... } | 0 | Test.kt:105:20:107:5 | { ... } |
158157
| Test.kt:105:20:107:5 | { ... } | 1 | Test.kt:106:9:106:29 | <Expr>; |
159158
| Test.kt:105:20:107:5 | { ... } | 2 | Test.kt:106:17:106:28 | "x not null" |
160159
| Test.kt:105:20:107:5 | { ... } | 3 | Test.kt:106:9:106:29 | println(...) |
161-
| Test.kt:107:16:107:24 | ... -> ... | 0 | Test.kt:107:16:107:24 | ... -> ... |
162-
| Test.kt:107:16:107:24 | ... -> ... | 1 | Test.kt:107:16:107:16 | y |
163-
| Test.kt:107:16:107:24 | ... -> ... | 2 | Test.kt:107:21:107:24 | null |
164-
| Test.kt:107:16:107:24 | ... -> ... | 3 | Test.kt:107:16:107:24 | ... (value not-equals) ... |
160+
| Test.kt:107:16:109:5 | ... -> ... | 0 | Test.kt:107:16:109:5 | ... -> ... |
161+
| Test.kt:107:16:109:5 | ... -> ... | 1 | Test.kt:107:16:107:16 | y |
162+
| Test.kt:107:16:109:5 | ... -> ... | 2 | Test.kt:107:21:107:24 | null |
163+
| Test.kt:107:16:109:5 | ... -> ... | 3 | Test.kt:107:16:107:24 | ... (value not-equals) ... |
165164
| Test.kt:107:27:109:5 | { ... } | 0 | Test.kt:107:27:109:5 | { ... } |
166165
| Test.kt:107:27:109:5 | { ... } | 1 | Test.kt:108:9:108:29 | <Expr>; |
167166
| Test.kt:107:27:109:5 | { ... } | 2 | Test.kt:108:17:108:28 | "y not null" |
@@ -170,7 +169,7 @@
170169
| Test.kt:112:32:116:1 | { ... } | 0 | Test.kt:112:32:116:1 | { ... } |
171170
| Test.kt:112:32:116:1 | { ... } | 1 | Test.kt:113:5:115:5 | <Expr>; |
172171
| Test.kt:112:32:116:1 | { ... } | 2 | Test.kt:113:5:115:5 | when ... |
173-
| Test.kt:112:32:116:1 | { ... } | 3 | Test.kt:113:9:113:14 | ... -> ... |
172+
| Test.kt:112:32:116:1 | { ... } | 3 | Test.kt:113:9:115:5 | ... -> ... |
174173
| Test.kt:112:32:116:1 | { ... } | 4 | Test.kt:113:9:113:14 | ... && ... |
175174
| Test.kt:112:32:116:1 | { ... } | 5 | Test.kt:113:9:113:9 | x |
176175
| Test.kt:113:14:113:14 | y | 0 | Test.kt:113:14:113:14 | y |

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,26 @@
22
| Test.kt:4:13:79:2 | { ... } | Test.kt:11:14:14:3 | { ... } |
33
| Test.kt:4:13:79:2 | { ... } | Test.kt:14:10:16:3 | ... -> ... |
44
| 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 | { ... } |
5+
| Test.kt:4:13:79:2 | { ... } | Test.kt:22:4:22:9 | <Expr>; |
66
| Test.kt:4:13:79:2 | { ... } | Test.kt:24:4:24:9 | ... -> ... |
77
| Test.kt:4:13:79:2 | { ... } | Test.kt:30:15:33:3 | { ... } |
88
| Test.kt:4:13:79:2 | { ... } | Test.kt:35:3:35:8 | <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 | { ... } |
1111
| Test.kt:4:13:79:2 | { ... } | Test.kt:43:3:43:8 | <Expr>; |
1212
| 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 | { ... } |
13+
| Test.kt:18:3:18:7 | <Expr>; | Test.kt:22:4:22:9 | <Expr>; |
1414
| Test.kt:18:3:18:7 | <Expr>; | Test.kt:24:4:24:9 | ... -> ... |
1515
| Test.kt:18:3:18:7 | <Expr>; | Test.kt:30:15:33:3 | { ... } |
1616
| Test.kt:18:3:18:7 | <Expr>; | Test.kt:35:3:35:8 | <Expr>; |
1717
| Test.kt:18:3:18:7 | <Expr>; | Test.kt:38:9:38:9 | x |
1818
| Test.kt:18:3:18:7 | <Expr>; | Test.kt:38:16:41:3 | { ... } |
1919
| Test.kt:18:3:18:7 | <Expr>; | Test.kt:43:3:43:8 | <Expr>; |
20-
| Test.kt:22:4:22:9 | { ... } | Test.kt:30:15:33:3 | { ... } |
21-
| Test.kt:22:4:22:9 | { ... } | Test.kt:35:3:35:8 | <Expr>; |
22-
| Test.kt:22:4:22:9 | { ... } | Test.kt:38:9:38:9 | x |
23-
| Test.kt:22:4:22:9 | { ... } | Test.kt:38:16:41:3 | { ... } |
24-
| Test.kt:22:4:22:9 | { ... } | 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>; |
2525
| Test.kt:35:3:35:8 | <Expr>; | Test.kt:38:9:38:9 | x |
2626
| Test.kt:35:3:35:8 | <Expr>; | Test.kt:38:16:41:3 | { ... } |
2727
| Test.kt:35:3:35:8 | <Expr>; | Test.kt:43:3:43:8 | <Expr>; |
@@ -38,13 +38,13 @@
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>; |
4040
| Test.kt:100:25:110:1 | { ... } | Test.kt:105:20:107:5 | { ... } |
41-
| Test.kt:100:25:110:1 | { ... } | Test.kt:107:16:107:24 | ... -> ... |
41+
| Test.kt:100:25:110:1 | { ... } | Test.kt:107:16:109:5 | ... -> ... |
4242
| Test.kt:100:25:110:1 | { ... } | Test.kt:107:27:109:5 | { ... } |
4343
| Test.kt:101:22:101:22 | y | Test.kt:101:33:103:5 | { ... } |
4444
| Test.kt:105:5:109:5 | <Expr>; | Test.kt:105:20:107:5 | { ... } |
45-
| Test.kt:105:5:109:5 | <Expr>; | Test.kt:107:16:107:24 | ... -> ... |
45+
| 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 | { ... } |
47-
| Test.kt:107:16:107:24 | ... -> ... | Test.kt:107:27:109:5 | { ... } |
47+
| Test.kt:107:16:109:5 | ... -> ... | Test.kt:107:27:109:5 | { ... } |
4848
| Test.kt:112:32:116:1 | { ... } | Test.kt:112:1:116:1 | fn |
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 | { ... } |

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
| Test.kt:4:13:79:2 | { ... } | Test.kt:14:10:16:3 | ... -> ... |
33
| Test.kt:11:14:14:3 | { ... } | Test.kt:18:3:18:7 | <Expr>; |
44
| 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 | { ... } |
5+
| Test.kt:18:3:18:7 | <Expr>; | Test.kt:22:4:22:9 | <Expr>; |
66
| Test.kt:18:3:18:7 | <Expr>; | Test.kt:24:4:24:9 | ... -> ... |
7-
| Test.kt:22:4:22:9 | { ... } | Test.kt:30:15:33:3 | { ... } |
8-
| Test.kt:22:4:22:9 | { ... } | Test.kt:35:3:35:8 | <Expr>; |
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>; |
99
| Test.kt:24:4:24:9 | ... -> ... | Test.kt:4:2:79:2 | test |
1010
| Test.kt:30:15:33:3 | { ... } | Test.kt:35:3:35:8 | <Expr>; |
1111
| Test.kt:35:3:35:8 | <Expr>; | Test.kt:38:9:38:9 | x |
@@ -27,10 +27,10 @@
2727
| Test.kt:101:22:101:22 | y | Test.kt:105:5:109:5 | <Expr>; |
2828
| Test.kt:101:33:103:5 | { ... } | Test.kt:100:1:110:1 | fn |
2929
| Test.kt:105:5:109:5 | <Expr>; | Test.kt:105:20:107:5 | { ... } |
30-
| Test.kt:105:5:109:5 | <Expr>; | Test.kt:107:16:107:24 | ... -> ... |
30+
| Test.kt:105:5:109:5 | <Expr>; | Test.kt:107:16:109:5 | ... -> ... |
3131
| Test.kt:105:20:107:5 | { ... } | Test.kt:100:1:110:1 | fn |
32-
| Test.kt:107:16:107:24 | ... -> ... | Test.kt:100:1:110:1 | fn |
33-
| Test.kt:107:16:107:24 | ... -> ... | Test.kt:107:27:109:5 | { ... } |
32+
| Test.kt:107:16:109:5 | ... -> ... | Test.kt:100:1:110:1 | fn |
33+
| Test.kt:107:16:109:5 | ... -> ... | Test.kt:107:27:109:5 | { ... } |
3434
| Test.kt:107:27:109:5 | { ... } | Test.kt:100:1:110:1 | fn |
3535
| Test.kt:112:32:116:1 | { ... } | Test.kt:112:1:116:1 | fn |
3636
| Test.kt:112:32:116:1 | { ... } | Test.kt:113:14:113:14 | y |

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

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@
2525
| Test.kt:8:3:8:16 | w | LocalVariableDeclExpr | Test.kt:11:3:16:3 | <Expr>; | ExprStmt |
2626
| Test.kt:8:16:8:16 | 0 | IntegerLiteral | Test.kt:8:3:8:16 | w | LocalVariableDeclExpr |
2727
| Test.kt:11:3:16:3 | <Expr>; | ExprStmt | Test.kt:11:3:16:3 | when ... | WhenExpr |
28-
| Test.kt:11:3:16:3 | when ... | WhenExpr | Test.kt:11:7:11:11 | ... -> ... | WhenBranch |
28+
| Test.kt:11:3:16:3 | when ... | WhenExpr | Test.kt:11:7:14:3 | ... -> ... | WhenBranch |
2929
| Test.kt:11:7:11:7 | x | VarAccess | Test.kt:11:11:11:11 | 0 | IntegerLiteral |
30-
| Test.kt:11:7:11:11 | ... -> ... | WhenBranch | Test.kt:11:7:11:7 | x | VarAccess |
3130
| Test.kt:11:7:11:11 | ... > ... | GTExpr | Test.kt:11:14:14:3 | { ... } | BlockStmt |
3231
| Test.kt:11:7:11:11 | ... > ... | GTExpr | Test.kt:14:10:16:3 | ... -> ... | WhenBranch |
32+
| Test.kt:11:7:14:3 | ... -> ... | WhenBranch | Test.kt:11:7:11:7 | x | VarAccess |
3333
| Test.kt:11:11:11:11 | 0 | IntegerLiteral | Test.kt:11:7:11:11 | ... > ... | GTExpr |
3434
| Test.kt:11:14:14:3 | { ... } | BlockStmt | Test.kt:12:4:12:9 | <Expr>; | ExprStmt |
3535
| Test.kt:12:4:12:9 | ...=... | AssignExpr | Test.kt:13:4:13:9 | <Expr>; | ExprStmt |
@@ -52,16 +52,15 @@
5252
| Test.kt:18:3:18:7 | z | VarAccess | file://:0:0:0:0 | <none> | <none> |
5353
| Test.kt:18:7:18:7 | 0 | IntegerLiteral | Test.kt:18:3:18:7 | ...=... | AssignExpr |
5454
| Test.kt:21:3:24:9 | <Expr>; | ExprStmt | Test.kt:21:3:24:9 | when ... | WhenExpr |
55-
| Test.kt:21:3:24:9 | when ... | WhenExpr | Test.kt:21:6:21:10 | ... -> ... | WhenBranch |
55+
| Test.kt:21:3:24:9 | when ... | WhenExpr | Test.kt:21:6:22:9 | ... -> ... | WhenBranch |
5656
| Test.kt:21:6:21:6 | x | VarAccess | Test.kt:21:10:21:10 | 0 | IntegerLiteral |
57-
| Test.kt:21:6:21:10 | ... -> ... | WhenBranch | Test.kt:21:6:21:6 | x | VarAccess |
58-
| Test.kt:21:6:21:10 | ... < ... | LTExpr | Test.kt:22:4:22:9 | { ... } | BlockStmt |
57+
| Test.kt:21:6:21:10 | ... < ... | LTExpr | Test.kt:22:4:22:9 | <Expr>; | ExprStmt |
5958
| Test.kt:21:6:21:10 | ... < ... | LTExpr | Test.kt:24:4:24:9 | ... -> ... | WhenBranch |
59+
| Test.kt:21:6:22:9 | ... -> ... | WhenBranch | Test.kt:21:6:21:6 | x | VarAccess |
6060
| Test.kt:21:10:21:10 | 0 | IntegerLiteral | Test.kt:21:6:21:10 | ... < ... | LTExpr |
6161
| Test.kt:22:4:22:9 | ...=... | AssignExpr | Test.kt:27:3:27:8 | <Expr>; | ExprStmt |
6262
| Test.kt:22:4:22:9 | <Expr>; | ExprStmt | Test.kt:22:8:22:9 | 40 | LongLiteral |
6363
| Test.kt:22:4:22:9 | y | VarAccess | file://:0:0:0:0 | <none> | <none> |
64-
| Test.kt:22:4:22:9 | { ... } | BlockStmt | Test.kt:22:4:22:9 | <Expr>; | ExprStmt |
6564
| Test.kt:22:8:22:9 | 40 | LongLiteral | Test.kt:22:4:22:9 | ...=... | AssignExpr |
6665
| Test.kt:24:4:24:9 | ... -> ... | WhenBranch | Test.kt:24:4:24:9 | true | BooleanLiteral |
6766
| Test.kt:24:4:24:9 | return ... | ReturnStmt | Test.kt:4:2:79:2 | test | Method |
@@ -72,11 +71,11 @@
7271
| Test.kt:27:3:27:8 | z | VarAccess | file://:0:0:0:0 | <none> | <none> |
7372
| Test.kt:27:7:27:8 | 10 | IntegerLiteral | Test.kt:27:3:27:8 | ...=... | AssignExpr |
7473
| Test.kt:30:3:33:3 | <Expr>; | ExprStmt | Test.kt:30:3:33:3 | when ... | WhenExpr |
75-
| Test.kt:30:3:33:3 | when ... | WhenExpr | Test.kt:30:7:30:12 | ... -> ... | WhenBranch |
74+
| Test.kt:30:3:33:3 | when ... | WhenExpr | Test.kt:30:7:33:3 | ... -> ... | WhenBranch |
7675
| Test.kt:30:7:30:7 | x | VarAccess | Test.kt:30:12:30:12 | 0 | IntegerLiteral |
7776
| Test.kt:30:7:30:12 | ... (value equals) ... | ValueEQExpr | Test.kt:30:15:33:3 | { ... } | BlockStmt |
7877
| Test.kt:30:7:30:12 | ... (value equals) ... | ValueEQExpr | Test.kt:35:3:35:8 | <Expr>; | ExprStmt |
79-
| Test.kt:30:7:30:12 | ... -> ... | WhenBranch | Test.kt:30:7:30:7 | x | VarAccess |
78+
| Test.kt:30:7:33:3 | ... -> ... | WhenBranch | Test.kt:30:7:30:7 | x | VarAccess |
8079
| Test.kt:30:12:30:12 | 0 | IntegerLiteral | Test.kt:30:7:30:12 | ... (value equals) ... | ValueEQExpr |
8180
| Test.kt:30:15:33:3 | { ... } | BlockStmt | Test.kt:31:4:31:9 | <Expr>; | ExprStmt |
8281
| Test.kt:31:4:31:9 | ...=... | AssignExpr | Test.kt:32:4:32:9 | <Expr>; | ExprStmt |
@@ -184,12 +183,12 @@
184183
| Test.kt:100:16:100:22 | y | Parameter | file://:0:0:0:0 | <none> | <none> |
185184
| Test.kt:100:25:110:1 | { ... } | BlockStmt | Test.kt:101:5:103:5 | <Expr>; | ExprStmt |
186185
| Test.kt:101:5:103:5 | <Expr>; | ExprStmt | Test.kt:101:5:103:5 | when ... | WhenExpr |
187-
| Test.kt:101:5:103:5 | when ... | WhenExpr | Test.kt:101:9:101:30 | ... -> ... | WhenBranch |
186+
| Test.kt:101:5:103:5 | when ... | WhenExpr | Test.kt:101:9:103:5 | ... -> ... | WhenBranch |
188187
| Test.kt:101:9:101:9 | x | VarAccess | Test.kt:101:14:101:17 | null | NullLiteral |
189188
| Test.kt:101:9:101:17 | ... (value equals) ... | ValueEQExpr | Test.kt:101:22:101:22 | y | VarAccess |
190189
| Test.kt:101:9:101:17 | ... (value equals) ... | ValueEQExpr | Test.kt:105:5:109:5 | <Expr>; | ExprStmt |
191190
| Test.kt:101:9:101:30 | ... && ... | AndLogicalExpr | Test.kt:101:9:101:9 | x | VarAccess |
192-
| Test.kt:101:9:101:30 | ... -> ... | WhenBranch | Test.kt:101:9:101:30 | ... && ... | AndLogicalExpr |
191+
| Test.kt:101:9:103:5 | ... -> ... | WhenBranch | Test.kt:101:9:101:30 | ... && ... | AndLogicalExpr |
193192
| Test.kt:101:14:101:17 | null | NullLiteral | Test.kt:101:9:101:17 | ... (value equals) ... | ValueEQExpr |
194193
| Test.kt:101:22:101:22 | y | VarAccess | Test.kt:101:27:101:30 | null | NullLiteral |
195194
| Test.kt:101:22:101:30 | ... (value equals) ... | ValueEQExpr | Test.kt:101:33:103:5 | { ... } | BlockStmt |
@@ -200,11 +199,11 @@
200199
| Test.kt:102:15:102:25 | Exception | TypeAccess | file://:0:0:0:0 | <none> | <none> |
201200
| Test.kt:102:15:102:25 | new Exception(...) | ClassInstanceExpr | Test.kt:102:9:102:25 | throw ... | ThrowStmt |
202201
| Test.kt:105:5:109:5 | <Expr>; | ExprStmt | Test.kt:105:5:109:5 | when ... | WhenExpr |
203-
| Test.kt:105:5:109:5 | when ... | WhenExpr | Test.kt:105:9:105:17 | ... -> ... | WhenBranch |
202+
| Test.kt:105:5:109:5 | when ... | WhenExpr | Test.kt:105:9:107:5 | ... -> ... | WhenBranch |
204203
| Test.kt:105:9:105:9 | x | VarAccess | Test.kt:105:14:105:17 | null | NullLiteral |
205204
| Test.kt:105:9:105:17 | ... (value not-equals) ... | ValueNEExpr | Test.kt:105:20:107:5 | { ... } | BlockStmt |
206-
| Test.kt:105:9:105:17 | ... (value not-equals) ... | ValueNEExpr | Test.kt:107:16:107:24 | ... -> ... | WhenBranch |
207-
| Test.kt:105:9:105:17 | ... -> ... | WhenBranch | Test.kt:105:9:105:9 | x | VarAccess |
205+
| Test.kt:105:9:105:17 | ... (value not-equals) ... | ValueNEExpr | Test.kt:107:16:109:5 | ... -> ... | WhenBranch |
206+
| Test.kt:105:9:107:5 | ... -> ... | WhenBranch | Test.kt:105:9:105:9 | x | VarAccess |
208207
| Test.kt:105:14:105:17 | null | NullLiteral | Test.kt:105:9:105:17 | ... (value not-equals) ... | ValueNEExpr |
209208
| Test.kt:105:20:107:5 | { ... } | BlockStmt | Test.kt:106:9:106:29 | <Expr>; | ExprStmt |
210209
| Test.kt:106:9:106:29 | <Expr>; | ExprStmt | Test.kt:106:17:106:28 | "x not null" | StringLiteral |
@@ -214,7 +213,7 @@
214213
| Test.kt:107:16:107:16 | y | VarAccess | Test.kt:107:21:107:24 | null | NullLiteral |
215214
| Test.kt:107:16:107:24 | ... (value not-equals) ... | ValueNEExpr | Test.kt:100:1:110:1 | fn | Method |
216215
| Test.kt:107:16:107:24 | ... (value not-equals) ... | ValueNEExpr | Test.kt:107:27:109:5 | { ... } | BlockStmt |
217-
| Test.kt:107:16:107:24 | ... -> ... | WhenBranch | Test.kt:107:16:107:16 | y | VarAccess |
216+
| Test.kt:107:16:109:5 | ... -> ... | WhenBranch | Test.kt:107:16:107:16 | y | VarAccess |
218217
| Test.kt:107:21:107:24 | null | NullLiteral | Test.kt:107:16:107:24 | ... (value not-equals) ... | ValueNEExpr |
219218
| Test.kt:107:27:109:5 | { ... } | BlockStmt | Test.kt:108:9:108:29 | <Expr>; | ExprStmt |
220219
| Test.kt:108:9:108:29 | <Expr>; | ExprStmt | Test.kt:108:17:108:28 | "y not null" | StringLiteral |
@@ -229,11 +228,11 @@
229228
| Test.kt:112:20:112:29 | y | Parameter | file://:0:0:0:0 | <none> | <none> |
230229
| Test.kt:112:32:116:1 | { ... } | BlockStmt | Test.kt:113:5:115:5 | <Expr>; | ExprStmt |
231230
| Test.kt:113:5:115:5 | <Expr>; | ExprStmt | Test.kt:113:5:115:5 | when ... | WhenExpr |
232-
| Test.kt:113:5:115:5 | when ... | WhenExpr | Test.kt:113:9:113:14 | ... -> ... | WhenBranch |
231+
| Test.kt:113:5:115:5 | when ... | WhenExpr | Test.kt:113:9:115:5 | ... -> ... | WhenBranch |
233232
| Test.kt:113:9:113:9 | x | VarAccess | Test.kt:112:1:116:1 | fn | Method |
234233
| Test.kt:113:9:113:9 | x | VarAccess | Test.kt:113:14:113:14 | y | VarAccess |
235234
| Test.kt:113:9:113:14 | ... && ... | AndLogicalExpr | Test.kt:113:9:113:9 | x | VarAccess |
236-
| Test.kt:113:9:113:14 | ... -> ... | WhenBranch | Test.kt:113:9:113:14 | ... && ... | AndLogicalExpr |
235+
| Test.kt:113:9:115:5 | ... -> ... | WhenBranch | Test.kt:113:9:113:14 | ... && ... | AndLogicalExpr |
237236
| Test.kt:113:14:113:14 | y | VarAccess | Test.kt:112:1:116:1 | fn | Method |
238237
| Test.kt:113:14:113:14 | y | VarAccess | Test.kt:113:17:115:5 | { ... } | BlockStmt |
239238
| Test.kt:113:17:115:5 | { ... } | BlockStmt | Test.kt:112:1:116:1 | fn | Method |

0 commit comments

Comments
 (0)