Merge pull request #14906 from igfoo/igfoo/locs

Kotlin 2: Accept some location changes in test-kotlin2/library-tests/stmts

Author: igfoo

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

@@ -1,5 +1,3 @@
-| stmts.kt:0:0:0:0 | component1(...) | MethodCall |
-| stmts.kt:0:0:0:0 | component2(...) | MethodCall |
 | stmts.kt:0:0:0:0 | tmp3_loop_parameter | VarAccess |
 | stmts.kt:2:1:20:1 | int | TypeAccess |
 | stmts.kt:2:20:2:25 | int | TypeAccess |
@@ -24,27 +22,27 @@
 | stmts.kt:14:13:14:13 | x | VarAccess |
 | stmts.kt:14:13:14:17 | ... < ... | LTExpr |
 | stmts.kt:14:17:14:17 | y | VarAccess |
-| stmts.kt:15:9:15:9 | z | LocalVariableDeclExpr |
+| stmts.kt:15:5:15:13 | z | LocalVariableDeclExpr |
 | stmts.kt:15:13:15:13 | 3 | IntegerLiteral |
-| stmts.kt:17:9:17:10 | q2 | LocalVariableDeclExpr |
-| stmts.kt:17:26:17:58 | true | BooleanLiteral |
+| stmts.kt:17:5:17:58 | q2 | LocalVariableDeclExpr |
 | stmts.kt:17:26:17:58 | when ... | WhenExpr |
 | stmts.kt:17:29:17:32 | true | BooleanLiteral |
 | stmts.kt:17:37:17:37 | z | VarAccess |
 | stmts.kt:17:37:17:41 | ...=... | AssignExpr |
 | stmts.kt:17:41:17:41 | 4 | IntegerLiteral |
+| stmts.kt:17:50:17:58 | true | BooleanLiteral |
 | stmts.kt:17:52:17:52 | z | VarAccess |
 | stmts.kt:17:52:17:56 | ...=... | AssignExpr |
 | stmts.kt:17:56:17:56 | 5 | IntegerLiteral |
-| stmts.kt:18:9:18:10 | q3 | LocalVariableDeclExpr |
-| stmts.kt:18:26:18:56 | true | BooleanLiteral |
+| stmts.kt:18:5:18:56 | q3 | LocalVariableDeclExpr |
 | stmts.kt:18:26:18:56 | when ... | WhenExpr |
 | stmts.kt:18:29:18:32 | true | BooleanLiteral |
 | stmts.kt:18:37:18:37 | z | VarAccess |
 | stmts.kt:18:37:18:41 | ...=... | AssignExpr |
 | stmts.kt:18:41:18:41 | 4 | IntegerLiteral |
 | stmts.kt:18:52:18:52 | z | VarAccess |
 | stmts.kt:18:52:18:56 | ...=... | AssignExpr |
+| stmts.kt:18:52:18:56 | true | BooleanLiteral |
 | stmts.kt:18:56:18:56 | 5 | IntegerLiteral |
 | stmts.kt:19:12:19:12 | x | VarAccess |
 | stmts.kt:19:12:19:16 | ... + ... | AddExpr |
@@ -84,7 +82,9 @@
 | stmts.kt:38:18:38:18 | y | VarAccess |
 | stmts.kt:38:18:38:24 | ... > ... | GTExpr |
 | stmts.kt:38:22:38:24 | 100 | IntegerLiteral |
+| stmts.kt:41:11:41:11 | component1(...) | MethodCall |
 | stmts.kt:41:11:41:11 | v | LocalVariableDeclExpr |
+| stmts.kt:41:13:41:13 | component2(...) | MethodCall |
 | stmts.kt:41:13:41:13 | i | LocalVariableDeclExpr |
 | stmts.kt:41:19:41:36 | tmp3_loop_parameter | LocalVariableDeclExpr |
 | stmts.kt:41:19:41:36 | tmp3_loop_parameter | VarAccess |
@@ -101,7 +101,7 @@
 | stmts.kt:46:1:56:1 | int | TypeAccess |
 | stmts.kt:48:15:48:30 | Exception | TypeAccess |
 | stmts.kt:48:15:48:30 | new Exception(...) | ClassInstanceExpr |
-| stmts.kt:48:26:48:28 | "Foo" | StringLiteral |
+| stmts.kt:48:25:48:29 | "Foo" | StringLiteral |
 | stmts.kt:50:12:50:23 | Exception | TypeAccess |
 | stmts.kt:50:12:50:23 | e | LocalVariableDeclExpr |
 | stmts.kt:51:16:51:16 | 1 | IntegerLiteral |

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

@@ -16,19 +16,19 @@
 | stmts.kt:12:5:14:18 | { ... } | BlockStmt |
 | stmts.kt:12:8:14:5 | { ... } | BlockStmt |
 | stmts.kt:13:9:13:16 | return ... | ReturnStmt |
-| stmts.kt:15:9:15:9 | var ...; | LocalVariableDeclStmt |
-| stmts.kt:17:9:17:10 | var ...; | LocalVariableDeclStmt |
+| stmts.kt:15:5:15:13 | var ...; | LocalVariableDeclStmt |
+| stmts.kt:17:5:17:58 | var ...; | LocalVariableDeclStmt |
 | stmts.kt:17:26:17:58 | ... -> ... | WhenBranch |
 | stmts.kt:17:26:17:58 | ... -> ... | WhenBranch |
 | stmts.kt:17:35:17:43 | { ... } | BlockStmt |
-| stmts.kt:17:37:17:37 | <Expr>; | ExprStmt |
+| stmts.kt:17:37:17:41 | <Expr>; | ExprStmt |
 | stmts.kt:17:50:17:58 | { ... } | BlockStmt |
-| stmts.kt:17:52:17:52 | <Expr>; | ExprStmt |
-| stmts.kt:18:9:18:10 | var ...; | LocalVariableDeclStmt |
+| stmts.kt:17:52:17:56 | <Expr>; | ExprStmt |
+| stmts.kt:18:5:18:56 | var ...; | LocalVariableDeclStmt |
 | stmts.kt:18:26:18:56 | ... -> ... | WhenBranch |
 | stmts.kt:18:26:18:56 | ... -> ... | WhenBranch |
-| stmts.kt:18:37:18:37 | <Expr>; | ExprStmt |
-| stmts.kt:18:52:18:52 | <Expr>; | ExprStmt |
+| stmts.kt:18:37:18:41 | <Expr>; | ExprStmt |
+| stmts.kt:18:52:18:56 | <Expr>; | ExprStmt |
 | stmts.kt:19:5:19:16 | return ... | ReturnStmt |
 | stmts.kt:22:27:44:1 | { ... } | BlockStmt |
 | stmts.kt:23:11:27:5 | <Label>: ... | LabeledStmt |