Skip to content

Commit f0f1b04

Browse files
igfooigfoo
authored
Merge pull request github#15639 from igfoo/igfoo/stmts
Kotlin 2: Accept changes in library-tests/stmts
2 parents 7ea49b6 + 5039acb commit f0f1b04

File tree

3 files changed

+46
-46
lines changed

3 files changed

+46
-46
lines changed

‎java/ql/test-kotlin2/library-tests/stmts/PrintAst.expected

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ stmts.kt:
153153
# 37| 1: [BreakStmt] break
154154
# 41| 4: [EnhancedForStmt] for (... : ...)
155155
#-----| 0: (Single Local Variable Declaration)
156-
# 41| 1: [LocalVariableDeclExpr] tmp3_loop_parameter
156+
# 41| 1: [LocalVariableDeclExpr] <destruct>
157157
# 41| 1: [MethodCall] withIndex(...)
158158
# 41| -2: [TypeAccess] Integer
159159
# 41| -1: [TypeAccess] CollectionsKt
@@ -163,12 +163,12 @@ stmts.kt:
163163
# 41| 2: [BlockStmt] { ... }
164164
# 41| 0: [LocalVariableDeclStmt] var ...;
165165
# 41| 1: [LocalVariableDeclExpr] v
166-
# 0| 0: [MethodCall] component1(...)
167-
# 41| -1: [VarAccess] tmp3_loop_parameter
166+
# 41| 0: [MethodCall] component1(...)
167+
# 41| -1: [VarAccess] <destruct>
168168
# 41| 1: [LocalVariableDeclStmt] var ...;
169169
# 41| 1: [LocalVariableDeclExpr] i
170-
# 0| 0: [MethodCall] component2(...)
171-
# 0| -1: [VarAccess] tmp3_loop_parameter
170+
# 41| 0: [MethodCall] component2(...)
171+
# 41| -1: [VarAccess] <destruct>
172172
# 41| 2: [BlockStmt] { ... }
173173
# 42| 0: [ExprStmt] <Expr>;
174174
# 42| 0: [WhenExpr] when ...

‎java/ql/test-kotlin2/library-tests/stmts/exprs.expected

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
| stmts.kt:0:0:0:0 | tmp3_loop_parameter | VarAccess |
21
| stmts.kt:2:1:20:1 | int | TypeAccess |
32
| stmts.kt:2:20:2:25 | int | TypeAccess |
43
| stmts.kt:2:28:2:33 | int | TypeAccess |
@@ -27,22 +26,22 @@
2726
| stmts.kt:17:5:17:58 | q2 | LocalVariableDeclExpr |
2827
| stmts.kt:17:26:17:58 | when ... | WhenExpr |
2928
| stmts.kt:17:29:17:32 | true | BooleanLiteral |
30-
| stmts.kt:17:37:17:37 | z | VarAccess |
3129
| stmts.kt:17:37:17:41 | ...=... | AssignExpr |
30+
| stmts.kt:17:37:17:41 | z | VarAccess |
3231
| stmts.kt:17:41:17:41 | 4 | IntegerLiteral |
3332
| stmts.kt:17:50:17:58 | true | BooleanLiteral |
34-
| stmts.kt:17:52:17:52 | z | VarAccess |
3533
| stmts.kt:17:52:17:56 | ...=... | AssignExpr |
34+
| stmts.kt:17:52:17:56 | z | VarAccess |
3635
| stmts.kt:17:56:17:56 | 5 | IntegerLiteral |
3736
| stmts.kt:18:5:18:56 | q3 | LocalVariableDeclExpr |
3837
| stmts.kt:18:26:18:56 | when ... | WhenExpr |
3938
| stmts.kt:18:29:18:32 | true | BooleanLiteral |
40-
| stmts.kt:18:37:18:37 | z | VarAccess |
4139
| stmts.kt:18:37:18:41 | ...=... | AssignExpr |
40+
| stmts.kt:18:37:18:41 | z | VarAccess |
4241
| stmts.kt:18:41:18:41 | 4 | IntegerLiteral |
43-
| stmts.kt:18:52:18:52 | z | VarAccess |
4442
| stmts.kt:18:52:18:56 | ...=... | AssignExpr |
4543
| stmts.kt:18:52:18:56 | true | BooleanLiteral |
44+
| stmts.kt:18:52:18:56 | z | VarAccess |
4645
| stmts.kt:18:56:18:56 | 5 | IntegerLiteral |
4746
| stmts.kt:19:12:19:12 | x | VarAccess |
4847
| stmts.kt:19:12:19:16 | ... + ... | AddExpr |
@@ -82,12 +81,13 @@
8281
| stmts.kt:38:18:38:18 | y | VarAccess |
8382
| stmts.kt:38:18:38:24 | ... > ... | GTExpr |
8483
| stmts.kt:38:22:38:24 | 100 | IntegerLiteral |
84+
| stmts.kt:41:10:41:14 | <destruct> | LocalVariableDeclExpr |
85+
| stmts.kt:41:11:41:11 | <destruct> | VarAccess |
8586
| stmts.kt:41:11:41:11 | component1(...) | MethodCall |
8687
| stmts.kt:41:11:41:11 | v | LocalVariableDeclExpr |
88+
| stmts.kt:41:13:41:13 | <destruct> | VarAccess |
8789
| stmts.kt:41:13:41:13 | component2(...) | MethodCall |
8890
| stmts.kt:41:13:41:13 | i | LocalVariableDeclExpr |
89-
| stmts.kt:41:19:41:36 | tmp3_loop_parameter | LocalVariableDeclExpr |
90-
| stmts.kt:41:19:41:36 | tmp3_loop_parameter | VarAccess |
9191
| stmts.kt:41:20:41:20 | x | VarAccess |
9292
| stmts.kt:41:20:41:23 | rangeTo(...) | MethodCall |
9393
| stmts.kt:41:20:41:36 | CollectionsKt | TypeAccess |

‎java/ql/test-kotlin2/library-tests/stmts/stmts.expected

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,16 @@
1818
| stmts.kt:13:9:13:16 | return ... | ReturnStmt |
1919
| stmts.kt:15:5:15:13 | var ...; | LocalVariableDeclStmt |
2020
| stmts.kt:17:5:17:58 | var ...; | LocalVariableDeclStmt |
21-
| stmts.kt:17:26:17:58 | ... -> ... | WhenBranch |
22-
| stmts.kt:17:26:17:58 | ... -> ... | WhenBranch |
21+
| stmts.kt:17:29:17:43 | ... -> ... | WhenBranch |
2322
| stmts.kt:17:35:17:43 | { ... } | BlockStmt |
2423
| stmts.kt:17:37:17:41 | <Expr>; | ExprStmt |
24+
| stmts.kt:17:50:17:58 | ... -> ... | WhenBranch |
2525
| stmts.kt:17:50:17:58 | { ... } | BlockStmt |
2626
| stmts.kt:17:52:17:56 | <Expr>; | ExprStmt |
2727
| stmts.kt:18:5:18:56 | var ...; | LocalVariableDeclStmt |
28-
| stmts.kt:18:26:18:56 | ... -> ... | WhenBranch |
29-
| stmts.kt:18:26:18:56 | ... -> ... | WhenBranch |
28+
| stmts.kt:18:29:18:41 | ... -> ... | WhenBranch |
3029
| stmts.kt:18:37:18:41 | <Expr>; | ExprStmt |
30+
| stmts.kt:18:52:18:56 | ... -> ... | WhenBranch |
3131
| stmts.kt:18:52:18:56 | <Expr>; | ExprStmt |
3232
| stmts.kt:19:5:19:16 | return ... | ReturnStmt |
3333
| stmts.kt:22:27:44:1 | { ... } | BlockStmt |
@@ -37,32 +37,32 @@
3737
| stmts.kt:24:9:26:25 | do ... while (...) | DoStmt |
3838
| stmts.kt:24:9:26:25 | { ... } | BlockStmt |
3939
| stmts.kt:24:13:26:9 | { ... } | BlockStmt |
40-
| stmts.kt:25:13:25:33 | ... -> ... | WhenBranch |
4140
| stmts.kt:25:13:25:33 | <Expr>; | ExprStmt |
41+
| stmts.kt:25:17:25:33 | ... -> ... | WhenBranch |
4242
| stmts.kt:25:24:25:33 | break | BreakStmt |
4343
| stmts.kt:28:5:29:16 | while (...) | WhileStmt |
4444
| stmts.kt:29:9:29:16 | continue | ContinueStmt |
4545
| stmts.kt:31:5:33:5 | for (... : ...) | EnhancedForStmt |
4646
| stmts.kt:31:21:33:5 | { ... } | BlockStmt |
47-
| stmts.kt:32:9:32:24 | ... -> ... | WhenBranch |
4847
| stmts.kt:32:9:32:24 | <Expr>; | ExprStmt |
48+
| stmts.kt:32:13:32:24 | ... -> ... | WhenBranch |
4949
| stmts.kt:32:20:32:24 | break | BreakStmt |
5050
| stmts.kt:35:13:39:5 | <Label>: ... | LabeledStmt |
5151
| stmts.kt:35:13:39:5 | for (... : ...) | EnhancedForStmt |
5252
| stmts.kt:35:29:39:5 | { ... } | BlockStmt |
5353
| stmts.kt:36:9:38:25 | do ... while (...) | DoStmt |
5454
| stmts.kt:36:9:38:25 | { ... } | BlockStmt |
5555
| stmts.kt:36:13:38:9 | { ... } | BlockStmt |
56-
| stmts.kt:37:13:37:36 | ... -> ... | WhenBranch |
5756
| stmts.kt:37:13:37:36 | <Expr>; | ExprStmt |
57+
| stmts.kt:37:17:37:36 | ... -> ... | WhenBranch |
5858
| stmts.kt:37:24:37:36 | break | BreakStmt |
5959
| stmts.kt:41:5:43:5 | for (... : ...) | EnhancedForStmt |
60-
| stmts.kt:41:5:43:5 | { ... } | BlockStmt |
6160
| stmts.kt:41:11:41:11 | var ...; | LocalVariableDeclStmt |
6261
| stmts.kt:41:13:41:13 | var ...; | LocalVariableDeclStmt |
6362
| stmts.kt:41:39:43:5 | { ... } | BlockStmt |
64-
| stmts.kt:42:9:42:24 | ... -> ... | WhenBranch |
63+
| stmts.kt:41:39:43:5 | { ... } | BlockStmt |
6564
| stmts.kt:42:9:42:24 | <Expr>; | ExprStmt |
65+
| stmts.kt:42:13:42:24 | ... -> ... | WhenBranch |
6666
| stmts.kt:42:20:42:24 | break | BreakStmt |
6767
| stmts.kt:46:23:56:1 | { ... } | BlockStmt |
6868
| stmts.kt:47:5:55:5 | try ... | TryStmt |
@@ -90,53 +90,53 @@ enclosing
9090
| stmts.kt:12:5:14:18 | { ... } | stmts.kt:2:41:20:1 | { ... } |
9191
| stmts.kt:12:8:14:5 | { ... } | stmts.kt:12:5:14:18 | do ... while (...) |
9292
| stmts.kt:13:9:13:16 | return ... | stmts.kt:12:8:14:5 | { ... } |
93-
| stmts.kt:15:9:15:9 | var ...; | stmts.kt:2:41:20:1 | { ... } |
94-
| stmts.kt:17:9:17:10 | var ...; | stmts.kt:2:41:20:1 | { ... } |
95-
| stmts.kt:17:26:17:58 | ... -> ... | stmts.kt:17:9:17:10 | var ...; |
96-
| stmts.kt:17:26:17:58 | ... -> ... | stmts.kt:17:9:17:10 | var ...; |
97-
| stmts.kt:17:35:17:43 | { ... } | stmts.kt:17:26:17:58 | ... -> ... |
98-
| stmts.kt:17:37:17:37 | <Expr>; | stmts.kt:17:35:17:43 | { ... } |
99-
| stmts.kt:17:50:17:58 | { ... } | stmts.kt:17:26:17:58 | ... -> ... |
100-
| stmts.kt:17:52:17:52 | <Expr>; | stmts.kt:17:50:17:58 | { ... } |
101-
| stmts.kt:18:9:18:10 | var ...; | stmts.kt:2:41:20:1 | { ... } |
102-
| stmts.kt:18:26:18:56 | ... -> ... | stmts.kt:18:9:18:10 | var ...; |
103-
| stmts.kt:18:26:18:56 | ... -> ... | stmts.kt:18:9:18:10 | var ...; |
104-
| stmts.kt:18:37:18:37 | <Expr>; | stmts.kt:18:26:18:56 | ... -> ... |
105-
| stmts.kt:18:52:18:52 | <Expr>; | stmts.kt:18:26:18:56 | ... -> ... |
93+
| stmts.kt:15:5:15:13 | var ...; | stmts.kt:2:41:20:1 | { ... } |
94+
| stmts.kt:17:5:17:58 | var ...; | stmts.kt:2:41:20:1 | { ... } |
95+
| stmts.kt:17:29:17:43 | ... -> ... | stmts.kt:17:5:17:58 | var ...; |
96+
| stmts.kt:17:35:17:43 | { ... } | stmts.kt:17:29:17:43 | ... -> ... |
97+
| stmts.kt:17:37:17:41 | <Expr>; | stmts.kt:17:35:17:43 | { ... } |
98+
| stmts.kt:17:50:17:58 | ... -> ... | stmts.kt:17:5:17:58 | var ...; |
99+
| stmts.kt:17:50:17:58 | { ... } | stmts.kt:17:50:17:58 | ... -> ... |
100+
| stmts.kt:17:52:17:56 | <Expr>; | stmts.kt:17:50:17:58 | { ... } |
101+
| stmts.kt:18:5:18:56 | var ...; | stmts.kt:2:41:20:1 | { ... } |
102+
| stmts.kt:18:29:18:41 | ... -> ... | stmts.kt:18:5:18:56 | var ...; |
103+
| stmts.kt:18:37:18:41 | <Expr>; | stmts.kt:18:29:18:41 | ... -> ... |
104+
| stmts.kt:18:52:18:56 | ... -> ... | stmts.kt:18:5:18:56 | var ...; |
105+
| stmts.kt:18:52:18:56 | <Expr>; | stmts.kt:18:52:18:56 | ... -> ... |
106106
| stmts.kt:19:5:19:16 | return ... | stmts.kt:2:41:20:1 | { ... } |
107107
| stmts.kt:23:11:27:5 | <Label>: ... | stmts.kt:22:27:44:1 | { ... } |
108108
| stmts.kt:23:11:27:5 | while (...) | stmts.kt:23:11:27:5 | <Label>: ... |
109109
| stmts.kt:23:27:27:5 | { ... } | stmts.kt:23:11:27:5 | while (...) |
110110
| stmts.kt:24:9:26:25 | do ... while (...) | stmts.kt:24:9:26:25 | { ... } |
111111
| stmts.kt:24:9:26:25 | { ... } | stmts.kt:23:27:27:5 | { ... } |
112112
| stmts.kt:24:13:26:9 | { ... } | stmts.kt:24:9:26:25 | do ... while (...) |
113-
| stmts.kt:25:13:25:33 | ... -> ... | stmts.kt:25:13:25:33 | <Expr>; |
114113
| stmts.kt:25:13:25:33 | <Expr>; | stmts.kt:24:13:26:9 | { ... } |
115-
| stmts.kt:25:24:25:33 | break | stmts.kt:25:13:25:33 | ... -> ... |
114+
| stmts.kt:25:17:25:33 | ... -> ... | stmts.kt:25:13:25:33 | <Expr>; |
115+
| stmts.kt:25:24:25:33 | break | stmts.kt:25:17:25:33 | ... -> ... |
116116
| stmts.kt:28:5:29:16 | while (...) | stmts.kt:22:27:44:1 | { ... } |
117117
| stmts.kt:29:9:29:16 | continue | stmts.kt:28:5:29:16 | while (...) |
118118
| stmts.kt:31:5:33:5 | for (... : ...) | stmts.kt:22:27:44:1 | { ... } |
119119
| stmts.kt:31:21:33:5 | { ... } | stmts.kt:31:5:33:5 | for (... : ...) |
120-
| stmts.kt:32:9:32:24 | ... -> ... | stmts.kt:32:9:32:24 | <Expr>; |
121120
| stmts.kt:32:9:32:24 | <Expr>; | stmts.kt:31:21:33:5 | { ... } |
122-
| stmts.kt:32:20:32:24 | break | stmts.kt:32:9:32:24 | ... -> ... |
121+
| stmts.kt:32:13:32:24 | ... -> ... | stmts.kt:32:9:32:24 | <Expr>; |
122+
| stmts.kt:32:20:32:24 | break | stmts.kt:32:13:32:24 | ... -> ... |
123123
| stmts.kt:35:13:39:5 | <Label>: ... | stmts.kt:22:27:44:1 | { ... } |
124124
| stmts.kt:35:13:39:5 | for (... : ...) | stmts.kt:35:13:39:5 | <Label>: ... |
125125
| stmts.kt:35:29:39:5 | { ... } | stmts.kt:35:13:39:5 | for (... : ...) |
126126
| stmts.kt:36:9:38:25 | do ... while (...) | stmts.kt:36:9:38:25 | { ... } |
127127
| stmts.kt:36:9:38:25 | { ... } | stmts.kt:35:29:39:5 | { ... } |
128128
| stmts.kt:36:13:38:9 | { ... } | stmts.kt:36:9:38:25 | do ... while (...) |
129-
| stmts.kt:37:13:37:36 | ... -> ... | stmts.kt:37:13:37:36 | <Expr>; |
130129
| stmts.kt:37:13:37:36 | <Expr>; | stmts.kt:36:13:38:9 | { ... } |
131-
| stmts.kt:37:24:37:36 | break | stmts.kt:37:13:37:36 | ... -> ... |
130+
| stmts.kt:37:17:37:36 | ... -> ... | stmts.kt:37:13:37:36 | <Expr>; |
131+
| stmts.kt:37:24:37:36 | break | stmts.kt:37:17:37:36 | ... -> ... |
132132
| stmts.kt:41:5:43:5 | for (... : ...) | stmts.kt:22:27:44:1 | { ... } |
133-
| stmts.kt:41:5:43:5 | { ... } | stmts.kt:41:5:43:5 | for (... : ...) |
134-
| stmts.kt:41:11:41:11 | var ...; | stmts.kt:41:5:43:5 | { ... } |
135-
| stmts.kt:41:13:41:13 | var ...; | stmts.kt:41:5:43:5 | { ... } |
136-
| stmts.kt:41:39:43:5 | { ... } | stmts.kt:41:5:43:5 | { ... } |
137-
| stmts.kt:42:9:42:24 | ... -> ... | stmts.kt:42:9:42:24 | <Expr>; |
133+
| stmts.kt:41:11:41:11 | var ...; | stmts.kt:41:39:43:5 | { ... } |
134+
| stmts.kt:41:13:41:13 | var ...; | stmts.kt:41:39:43:5 | { ... } |
135+
| stmts.kt:41:39:43:5 | { ... } | stmts.kt:41:5:43:5 | for (... : ...) |
136+
| stmts.kt:41:39:43:5 | { ... } | stmts.kt:41:39:43:5 | { ... } |
138137
| stmts.kt:42:9:42:24 | <Expr>; | stmts.kt:41:39:43:5 | { ... } |
139-
| stmts.kt:42:20:42:24 | break | stmts.kt:42:9:42:24 | ... -> ... |
138+
| stmts.kt:42:13:42:24 | ... -> ... | stmts.kt:42:9:42:24 | <Expr>; |
139+
| stmts.kt:42:20:42:24 | break | stmts.kt:42:13:42:24 | ... -> ... |
140140
| stmts.kt:47:5:55:5 | try ... | stmts.kt:46:23:56:1 | { ... } |
141141
| stmts.kt:47:9:49:5 | { ... } | stmts.kt:47:5:55:5 | try ... |
142142
| stmts.kt:48:9:48:30 | throw ... | stmts.kt:47:9:49:5 | { ... } |

0 commit comments

Comments
 (0)