Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 49d2e86

Browse files
igfooigfoo
committed
Kotlin: Accept test changes
1 parent ba335b0 commit 49d2e86

7 files changed

Lines changed: 59 additions & 12 deletions

File tree

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

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,18 @@
8080
| Test.kt:38:16:41:3 | { ... } | 2 | Test.kt:39:8:39:9 | 10 |
8181
| Test.kt:38:16:41:3 | { ... } | 3 | Test.kt:39:4:39:4 | ...=... |
8282
| Test.kt:38:16:41:3 | { ... } | 4 | Test.kt:40:4:40:6 | <Expr>; |
83-
| Test.kt:38:16:41:3 | { ... } | 5 | Test.kt:40:4:40:6 | (...)... |
83+
| Test.kt:40:4:40:6 | <Stmt> | 0 | Test.kt:40:4:40:6 | <Stmt> |
84+
| Test.kt:40:4:40:6 | <Stmt> | 1 | Test.kt:40:4:40:6 | { ... } |
85+
| Test.kt:40:4:40:6 | <Stmt> | 2 | file://:0:0:0:0 | var ...; |
86+
| Test.kt:40:4:40:6 | <Stmt> | 3 | Test.kt:40:4:40:4 | x |
87+
| Test.kt:40:4:40:6 | <Stmt> | 4 | file://:0:0:0:0 | tmp0 |
88+
| Test.kt:40:4:40:6 | <Stmt> | 5 | Test.kt:40:4:40:4 | <Expr>; |
89+
| Test.kt:40:4:40:6 | <Stmt> | 6 | Test.kt:40:4:40:6 | tmp0 |
90+
| Test.kt:40:4:40:6 | <Stmt> | 7 | Test.kt:40:4:40:6 | dec(...) |
91+
| Test.kt:40:4:40:6 | <Stmt> | 8 | Test.kt:40:4:40:4 | ...=... |
92+
| Test.kt:40:4:40:6 | <Stmt> | 9 | Test.kt:40:4:40:6 | <Expr>; |
93+
| Test.kt:40:4:40:6 | <Stmt> | 10 | Test.kt:40:4:40:6 | tmp0 |
94+
| Test.kt:40:4:40:6 | <Stmt> | 11 | Test.kt:40:4:40:6 | (...)... |
8495
| Test.kt:43:3:43:3 | <Expr>; | 0 | Test.kt:43:3:43:3 | <Expr>; |
8596
| Test.kt:43:3:43:3 | <Expr>; | 1 | Test.kt:43:7:43:8 | 30 |
8697
| Test.kt:43:3:43:3 | <Expr>; | 2 | Test.kt:43:3:43:3 | ...=... |

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66
| Test.kt:35:3:35:3 | <Expr>; | Test.kt:38:9:38:9 | x |
77
| Test.kt:38:9:38:9 | x | Test.kt:38:16:41:3 | { ... } |
88
| Test.kt:38:9:38:9 | x | Test.kt:43:3:43:3 | <Expr>; |
9-
| Test.kt:38:16:41:3 | { ... } | Test.kt:38:9:38:9 | x |
9+
| Test.kt:40:4:40:6 | <Stmt> | Test.kt:38:9:38:9 | x |

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

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,18 @@
9292
| Test.kt:39:4:39:4 | ...=... | AssignExpr | Test.kt:40:4:40:6 | <Expr>; | ExprStmt |
9393
| Test.kt:39:4:39:4 | <Expr>; | ExprStmt | Test.kt:39:8:39:9 | 10 | LongLiteral |
9494
| Test.kt:39:8:39:9 | 10 | LongLiteral | Test.kt:39:4:39:4 | ...=... | AssignExpr |
95+
| Test.kt:40:4:40:4 | ...=... | AssignExpr | Test.kt:40:4:40:6 | <Expr>; | ExprStmt |
96+
| Test.kt:40:4:40:4 | <Expr>; | ExprStmt | Test.kt:40:4:40:6 | tmp0 | VarAccess |
97+
| Test.kt:40:4:40:4 | x | VarAccess | file://:0:0:0:0 | tmp0 | LocalVariableDeclExpr |
9598
| Test.kt:40:4:40:6 | (...)... | CastExpr | Test.kt:38:9:38:9 | x | VarAccess |
96-
| Test.kt:40:4:40:6 | <Expr>; | ExprStmt | Test.kt:40:4:40:6 | (...)... | CastExpr |
99+
| Test.kt:40:4:40:6 | <Expr>; | ExprStmt | Test.kt:40:4:40:6 | tmp0 | VarAccess |
100+
| Test.kt:40:4:40:6 | <Expr>; | ExprStmt | file://:0:0:0:0 | <none> | <none> |
101+
| Test.kt:40:4:40:6 | <Stmt> | StmtExpr | Test.kt:40:4:40:6 | { ... } | BlockStmt |
102+
| Test.kt:40:4:40:6 | dec(...) | MethodAccess | Test.kt:40:4:40:4 | ...=... | AssignExpr |
103+
| Test.kt:40:4:40:6 | tmp0 | VarAccess | Test.kt:40:4:40:6 | (...)... | CastExpr |
104+
| Test.kt:40:4:40:6 | tmp0 | VarAccess | Test.kt:40:4:40:6 | dec(...) | MethodAccess |
97105
| Test.kt:40:4:40:6 | void | TypeAccess | file://:0:0:0:0 | <none> | <none> |
106+
| Test.kt:40:4:40:6 | { ... } | BlockStmt | file://:0:0:0:0 | var ...; | LocalVariableDeclStmt |
98107
| Test.kt:43:3:43:3 | ...=... | AssignExpr | Test.kt:73:3:73:3 | <Expr>; | ExprStmt |
99108
| Test.kt:43:3:43:3 | <Expr>; | ExprStmt | Test.kt:43:7:43:8 | 30 | IntegerLiteral |
100109
| Test.kt:43:7:43:8 | 30 | IntegerLiteral | Test.kt:43:3:43:3 | ...=... | AssignExpr |

‎java/ql/test/kotlin/library-tests/controlflow/basic/strictDominance.expected‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -282,9 +282,15 @@
282282
| Test.kt:38:16:41:3 | { ... } | Test.kt:39:4:39:4 | <Expr>; |
283283
| Test.kt:38:16:41:3 | { ... } | Test.kt:40:4:40:6 | <Expr>; |
284284
| Test.kt:39:4:39:4 | <Expr>; | Test.kt:40:4:40:6 | <Expr>; |
285+
| Test.kt:40:4:40:4 | <Expr>; | Test.kt:40:4:40:6 | <Expr>; |
286+
| Test.kt:40:4:40:6 | { ... } | Test.kt:40:4:40:4 | <Expr>; |
287+
| Test.kt:40:4:40:6 | { ... } | Test.kt:40:4:40:6 | <Expr>; |
288+
| Test.kt:40:4:40:6 | { ... } | file://:0:0:0:0 | var ...; |
285289
| Test.kt:43:3:43:3 | <Expr>; | Test.kt:73:3:73:3 | <Expr>; |
286290
| Test.kt:43:3:43:3 | <Expr>; | Test.kt:77:3:77:3 | <Expr>; |
287291
| Test.kt:43:3:43:3 | <Expr>; | Test.kt:78:3:78:8 | return ... |
288292
| Test.kt:73:3:73:3 | <Expr>; | Test.kt:77:3:77:3 | <Expr>; |
289293
| Test.kt:73:3:73:3 | <Expr>; | Test.kt:78:3:78:8 | return ... |
290294
| Test.kt:77:3:77:3 | <Expr>; | Test.kt:78:3:78:8 | return ... |
295+
| file://:0:0:0:0 | var ...; | Test.kt:40:4:40:4 | <Expr>; |
296+
| file://:0:0:0:0 | var ...; | Test.kt:40:4:40:6 | <Expr>; |

‎java/ql/test/kotlin/library-tests/controlflow/basic/strictPostDominance.expected‎

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,13 @@
146146
| Test.kt:38:3:41:3 | while (...) | Test.kt:32:4:32:4 | <Expr>; |
147147
| Test.kt:38:3:41:3 | while (...) | Test.kt:35:3:35:3 | <Expr>; |
148148
| Test.kt:39:4:39:4 | <Expr>; | Test.kt:38:16:41:3 | { ... } |
149+
| Test.kt:40:4:40:4 | <Expr>; | Test.kt:40:4:40:6 | { ... } |
150+
| Test.kt:40:4:40:4 | <Expr>; | file://:0:0:0:0 | var ...; |
149151
| Test.kt:40:4:40:6 | <Expr>; | Test.kt:38:16:41:3 | { ... } |
150152
| Test.kt:40:4:40:6 | <Expr>; | Test.kt:39:4:39:4 | <Expr>; |
153+
| Test.kt:40:4:40:6 | <Expr>; | Test.kt:40:4:40:4 | <Expr>; |
154+
| Test.kt:40:4:40:6 | <Expr>; | Test.kt:40:4:40:6 | { ... } |
155+
| Test.kt:40:4:40:6 | <Expr>; | file://:0:0:0:0 | var ...; |
151156
| Test.kt:43:3:43:3 | <Expr>; | Test.kt:4:13:79:2 | { ... } |
152157
| Test.kt:43:3:43:3 | <Expr>; | Test.kt:5:3:5:16 | var ...; |
153158
| Test.kt:43:3:43:3 | <Expr>; | Test.kt:6:3:6:18 | var ...; |
@@ -169,9 +174,10 @@
169174
| Test.kt:43:3:43:3 | <Expr>; | Test.kt:32:4:32:4 | <Expr>; |
170175
| Test.kt:43:3:43:3 | <Expr>; | Test.kt:35:3:35:3 | <Expr>; |
171176
| Test.kt:43:3:43:3 | <Expr>; | Test.kt:38:3:41:3 | while (...) |
172-
| Test.kt:43:3:43:3 | <Expr>; | Test.kt:38:16:41:3 | { ... } |
173-
| Test.kt:43:3:43:3 | <Expr>; | Test.kt:39:4:39:4 | <Expr>; |
177+
| Test.kt:43:3:43:3 | <Expr>; | Test.kt:40:4:40:4 | <Expr>; |
174178
| Test.kt:43:3:43:3 | <Expr>; | Test.kt:40:4:40:6 | <Expr>; |
179+
| Test.kt:43:3:43:3 | <Expr>; | Test.kt:40:4:40:6 | { ... } |
180+
| Test.kt:43:3:43:3 | <Expr>; | file://:0:0:0:0 | var ...; |
175181
| Test.kt:73:3:73:3 | <Expr>; | Test.kt:4:13:79:2 | { ... } |
176182
| Test.kt:73:3:73:3 | <Expr>; | Test.kt:5:3:5:16 | var ...; |
177183
| Test.kt:73:3:73:3 | <Expr>; | Test.kt:6:3:6:18 | var ...; |
@@ -193,10 +199,11 @@
193199
| Test.kt:73:3:73:3 | <Expr>; | Test.kt:32:4:32:4 | <Expr>; |
194200
| Test.kt:73:3:73:3 | <Expr>; | Test.kt:35:3:35:3 | <Expr>; |
195201
| Test.kt:73:3:73:3 | <Expr>; | Test.kt:38:3:41:3 | while (...) |
196-
| Test.kt:73:3:73:3 | <Expr>; | Test.kt:38:16:41:3 | { ... } |
197-
| Test.kt:73:3:73:3 | <Expr>; | Test.kt:39:4:39:4 | <Expr>; |
202+
| Test.kt:73:3:73:3 | <Expr>; | Test.kt:40:4:40:4 | <Expr>; |
198203
| Test.kt:73:3:73:3 | <Expr>; | Test.kt:40:4:40:6 | <Expr>; |
204+
| Test.kt:73:3:73:3 | <Expr>; | Test.kt:40:4:40:6 | { ... } |
199205
| Test.kt:73:3:73:3 | <Expr>; | Test.kt:43:3:43:3 | <Expr>; |
206+
| Test.kt:73:3:73:3 | <Expr>; | file://:0:0:0:0 | var ...; |
200207
| Test.kt:77:3:77:3 | <Expr>; | Test.kt:4:13:79:2 | { ... } |
201208
| Test.kt:77:3:77:3 | <Expr>; | Test.kt:5:3:5:16 | var ...; |
202209
| Test.kt:77:3:77:3 | <Expr>; | Test.kt:6:3:6:18 | var ...; |
@@ -218,11 +225,12 @@
218225
| Test.kt:77:3:77:3 | <Expr>; | Test.kt:32:4:32:4 | <Expr>; |
219226
| Test.kt:77:3:77:3 | <Expr>; | Test.kt:35:3:35:3 | <Expr>; |
220227
| Test.kt:77:3:77:3 | <Expr>; | Test.kt:38:3:41:3 | while (...) |
221-
| Test.kt:77:3:77:3 | <Expr>; | Test.kt:38:16:41:3 | { ... } |
222-
| Test.kt:77:3:77:3 | <Expr>; | Test.kt:39:4:39:4 | <Expr>; |
228+
| Test.kt:77:3:77:3 | <Expr>; | Test.kt:40:4:40:4 | <Expr>; |
223229
| Test.kt:77:3:77:3 | <Expr>; | Test.kt:40:4:40:6 | <Expr>; |
230+
| Test.kt:77:3:77:3 | <Expr>; | Test.kt:40:4:40:6 | { ... } |
224231
| Test.kt:77:3:77:3 | <Expr>; | Test.kt:43:3:43:3 | <Expr>; |
225232
| Test.kt:77:3:77:3 | <Expr>; | Test.kt:73:3:73:3 | <Expr>; |
233+
| Test.kt:77:3:77:3 | <Expr>; | file://:0:0:0:0 | var ...; |
226234
| Test.kt:78:3:78:8 | return ... | Test.kt:4:13:79:2 | { ... } |
227235
| Test.kt:78:3:78:8 | return ... | Test.kt:5:3:5:16 | var ...; |
228236
| Test.kt:78:3:78:8 | return ... | Test.kt:6:3:6:18 | var ...; |
@@ -244,9 +252,11 @@
244252
| Test.kt:78:3:78:8 | return ... | Test.kt:32:4:32:4 | <Expr>; |
245253
| Test.kt:78:3:78:8 | return ... | Test.kt:35:3:35:3 | <Expr>; |
246254
| Test.kt:78:3:78:8 | return ... | Test.kt:38:3:41:3 | while (...) |
247-
| Test.kt:78:3:78:8 | return ... | Test.kt:38:16:41:3 | { ... } |
248-
| Test.kt:78:3:78:8 | return ... | Test.kt:39:4:39:4 | <Expr>; |
255+
| Test.kt:78:3:78:8 | return ... | Test.kt:40:4:40:4 | <Expr>; |
249256
| Test.kt:78:3:78:8 | return ... | Test.kt:40:4:40:6 | <Expr>; |
257+
| Test.kt:78:3:78:8 | return ... | Test.kt:40:4:40:6 | { ... } |
250258
| Test.kt:78:3:78:8 | return ... | Test.kt:43:3:43:3 | <Expr>; |
251259
| Test.kt:78:3:78:8 | return ... | Test.kt:73:3:73:3 | <Expr>; |
252260
| Test.kt:78:3:78:8 | return ... | Test.kt:77:3:77:3 | <Expr>; |
261+
| Test.kt:78:3:78:8 | return ... | file://:0:0:0:0 | var ...; |
262+
| file://:0:0:0:0 | var ...; | Test.kt:40:4:40:6 | { ... } |

‎java/ql/test/kotlin/library-tests/controlflow/dominance/dominator.expected‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@
2323
| Test.kt:38:3:41:3 | while (...) | Test.kt:38:10:38:10 | x |
2424
| Test.kt:38:17:41:3 | { ... } | Test.kt:39:4:39:4 | <Expr>; |
2525
| Test.kt:39:4:39:4 | <Expr>; | Test.kt:39:8:39:9 | 10 |
26-
| Test.kt:40:4:40:6 | <Expr>; | Test.kt:40:4:40:6 | (...)... |
26+
| Test.kt:40:4:40:4 | <Expr>; | Test.kt:40:4:40:6 | tmp0 |
27+
| Test.kt:40:4:40:6 | <Expr>; | Test.kt:40:4:40:6 | tmp0 |
28+
| Test.kt:40:4:40:6 | { ... } | file://:0:0:0:0 | var ...; |
2729
| Test.kt:43:3:43:3 | <Expr>; | Test.kt:43:3:43:3 | z |
2830
| Test.kt:73:3:73:3 | <Expr>; | Test.kt:73:3:73:3 | z |
2931
| Test.kt:77:3:77:3 | <Expr>; | Test.kt:77:7:77:8 | 40 |
@@ -42,3 +44,4 @@
4244
| Test.kt:92:4:93:9 | <Expr>; | Test.kt:92:4:93:9 | when ... |
4345
| Test.kt:94:4:95:12 | <Expr>; | Test.kt:94:4:95:12 | when ... |
4446
| Test.kt:97:3:97:10 | return ... | Test.kt:81:2:98:2 | test2 |
47+
| file://:0:0:0:0 | var ...; | Test.kt:40:4:40:4 | x |

‎java/ql/test/kotlin/library-tests/exprs/exprs.expected‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,13 @@
7474
| exprs.kt:50:12:50:19 | variable | VarAccess |
7575
| exprs.kt:50:12:50:23 | ... > ... | GTExpr |
7676
| exprs.kt:50:23:50:23 | 0 | IntegerLiteral |
77+
| exprs.kt:51:9:51:16 | ...=... | AssignExpr |
78+
| exprs.kt:51:9:51:16 | variable | VarAccess |
7779
| exprs.kt:51:9:51:18 | (...)... | CastExpr |
80+
| exprs.kt:51:9:51:18 | <Stmt> | StmtExpr |
81+
| exprs.kt:51:9:51:18 | dec(...) | MethodAccess |
82+
| exprs.kt:51:9:51:18 | tmp0 | VarAccess |
83+
| exprs.kt:51:9:51:18 | tmp0 | VarAccess |
7884
| exprs.kt:51:9:51:18 | void | TypeAccess |
7985
| exprs.kt:54:12:54:14 | 123 | IntegerLiteral |
8086
| exprs.kt:54:12:54:20 | ... + ... | AddExpr |
@@ -111,3 +117,5 @@
111117
| exprs.kt:78:29:78:29 | (...)... | CastExpr |
112118
| exprs.kt:78:29:78:29 | Rectangle | TypeAccess |
113119
| exprs.kt:78:29:78:29 | r | VarAccess |
120+
| file://:0:0:0:0 | tmp0 | LocalVariableDeclExpr |
121+
| file://:0:0:0:0 | variable | VarAccess |

0 commit comments

Comments
 (0)