Skip to content

Commit fc20cf7

Browse files
igfooigfoo
authored
Merge pull request github#54 from github/igfoo/tests
Kotlin: Accept test changes
2 parents f6648ee + 53b952a commit fc20cf7

File tree

3 files changed

+29
-26
lines changed

3 files changed

+29
-26
lines changed

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

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,69 @@
1+
| exprs.kt:3:5:3:14 | i1 | LocalVariableDeclExpr |
12
| exprs.kt:3:14:3:14 | 1 | IntegerLiteral |
3+
| exprs.kt:4:5:4:18 | i2 | LocalVariableDeclExpr |
24
| exprs.kt:4:14:4:14 | x | VarAccess |
35
| exprs.kt:4:14:4:18 | ... + ... | AddExpr |
46
| exprs.kt:4:18:4:18 | y | VarAccess |
7+
| exprs.kt:5:5:5:18 | i3 | LocalVariableDeclExpr |
58
| exprs.kt:5:14:5:14 | x | VarAccess |
69
| exprs.kt:5:14:5:18 | ... - ... | SubExpr |
710
| exprs.kt:5:18:5:18 | y | VarAccess |
11+
| exprs.kt:6:5:6:18 | i4 | LocalVariableDeclExpr |
812
| exprs.kt:6:14:6:14 | x | VarAccess |
913
| exprs.kt:6:14:6:18 | ... / ... | DivExpr |
1014
| exprs.kt:6:18:6:18 | y | VarAccess |
15+
| exprs.kt:7:5:7:18 | i5 | LocalVariableDeclExpr |
1116
| exprs.kt:7:14:7:14 | x | VarAccess |
1217
| exprs.kt:7:14:7:18 | ... % ... | RemExpr |
1318
| exprs.kt:7:18:7:18 | y | VarAccess |
19+
| exprs.kt:18:5:18:20 | i13 | LocalVariableDeclExpr |
1420
| exprs.kt:18:15:18:15 | x | VarAccess |
1521
| exprs.kt:18:15:18:20 | ... == ... | EQExpr |
1622
| exprs.kt:18:20:18:20 | y | VarAccess |
23+
| exprs.kt:19:5:19:20 | i14 | LocalVariableDeclExpr |
1724
| exprs.kt:19:15:19:15 | x | VarAccess |
1825
| exprs.kt:19:15:19:20 | ... != ... | NEExpr |
1926
| exprs.kt:19:15:19:20 | ... != ... | NEExpr |
2027
| exprs.kt:19:20:19:20 | y | VarAccess |
28+
| exprs.kt:20:5:20:19 | i15 | LocalVariableDeclExpr |
2129
| exprs.kt:20:15:20:15 | x | VarAccess |
2230
| exprs.kt:20:15:20:19 | ... < ... | LTExpr |
2331
| exprs.kt:20:19:20:19 | y | VarAccess |
32+
| exprs.kt:21:5:21:20 | i16 | LocalVariableDeclExpr |
2433
| exprs.kt:21:15:21:15 | x | VarAccess |
2534
| exprs.kt:21:15:21:20 | ... <= ... | LEExpr |
2635
| exprs.kt:21:20:21:20 | y | VarAccess |
36+
| exprs.kt:22:5:22:19 | i17 | LocalVariableDeclExpr |
2737
| exprs.kt:22:15:22:15 | x | VarAccess |
2838
| exprs.kt:22:15:22:19 | ... > ... | GTExpr |
2939
| exprs.kt:22:19:22:19 | y | VarAccess |
40+
| exprs.kt:23:5:23:20 | i18 | LocalVariableDeclExpr |
3041
| exprs.kt:23:15:23:15 | x | VarAccess |
3142
| exprs.kt:23:15:23:20 | ... >= ... | GEExpr |
3243
| exprs.kt:23:20:23:20 | y | VarAccess |
44+
| exprs.kt:29:5:29:17 | b1 | LocalVariableDeclExpr |
3345
| exprs.kt:29:14:29:17 | true | BooleanLiteral |
46+
| exprs.kt:30:5:30:18 | b2 | LocalVariableDeclExpr |
3447
| exprs.kt:30:14:30:18 | false | BooleanLiteral |
48+
| exprs.kt:37:5:37:15 | c | LocalVariableDeclExpr |
3549
| exprs.kt:37:13:37:15 | x | CharacterLiteral |
50+
| exprs.kt:38:5:38:26 | str | LocalVariableDeclExpr |
3651
| exprs.kt:38:16:38:25 | string lit | StringLiteral |
52+
| exprs.kt:39:5:39:38 | strWithQuote | LocalVariableDeclExpr |
3753
| exprs.kt:39:25:39:37 | string " lit | StringLiteral |
54+
| exprs.kt:40:5:40:22 | b6 | LocalVariableDeclExpr |
55+
| exprs.kt:41:5:41:23 | b7 | LocalVariableDeclExpr |
56+
| exprs.kt:42:5:42:26 | b8 | LocalVariableDeclExpr |
57+
| exprs.kt:43:5:43:35 | str1 | LocalVariableDeclExpr |
3858
| exprs.kt:43:25:43:34 | string lit | StringLiteral |
59+
| exprs.kt:44:5:44:36 | str2 | LocalVariableDeclExpr |
3960
| exprs.kt:44:26:44:35 | string lit | StringLiteral |
61+
| exprs.kt:45:5:45:28 | str3 | LocalVariableDeclExpr |
4062
| exprs.kt:45:25:45:28 | null | NullLiteral |
4163
| exprs.kt:46:12:46:14 | 123 | IntegerLiteral |
4264
| exprs.kt:46:12:46:20 | ... + ... | AddExpr |
4365
| exprs.kt:46:18:46:20 | 456 | IntegerLiteral |
66+
| exprs.kt:50:5:50:23 | d | LocalVariableDeclExpr |
4467
| exprs.kt:50:13:50:16 | true | BooleanLiteral |
4568
| exprs.kt:50:13:50:23 | ::class | ClassExpr |
4669
| exprs.kt:53:1:55:1 | <obinit>(...) | MethodAccess |
@@ -49,26 +72,3 @@
4972
| exprs.kt:53:9:53:18 | n | VarAccess |
5073
| exprs.kt:54:27:54:31 | new C(...) | ClassInstanceExpr |
5174
| exprs.kt:54:29:54:30 | 42 | IntegerLiteral |
52-
| file://:0:0:0:0 | b1 | LocalVariableDeclExpr |
53-
| file://:0:0:0:0 | b2 | LocalVariableDeclExpr |
54-
| file://:0:0:0:0 | b6 | LocalVariableDeclExpr |
55-
| file://:0:0:0:0 | b7 | LocalVariableDeclExpr |
56-
| file://:0:0:0:0 | b8 | LocalVariableDeclExpr |
57-
| file://:0:0:0:0 | c | LocalVariableDeclExpr |
58-
| file://:0:0:0:0 | d | LocalVariableDeclExpr |
59-
| file://:0:0:0:0 | i1 | LocalVariableDeclExpr |
60-
| file://:0:0:0:0 | i2 | LocalVariableDeclExpr |
61-
| file://:0:0:0:0 | i3 | LocalVariableDeclExpr |
62-
| file://:0:0:0:0 | i4 | LocalVariableDeclExpr |
63-
| file://:0:0:0:0 | i5 | LocalVariableDeclExpr |
64-
| file://:0:0:0:0 | i13 | LocalVariableDeclExpr |
65-
| file://:0:0:0:0 | i14 | LocalVariableDeclExpr |
66-
| file://:0:0:0:0 | i15 | LocalVariableDeclExpr |
67-
| file://:0:0:0:0 | i16 | LocalVariableDeclExpr |
68-
| file://:0:0:0:0 | i17 | LocalVariableDeclExpr |
69-
| file://:0:0:0:0 | i18 | LocalVariableDeclExpr |
70-
| file://:0:0:0:0 | str | LocalVariableDeclExpr |
71-
| file://:0:0:0:0 | str1 | LocalVariableDeclExpr |
72-
| file://:0:0:0:0 | str2 | LocalVariableDeclExpr |
73-
| file://:0:0:0:0 | str3 | LocalVariableDeclExpr |
74-
| file://:0:0:0:0 | strWithQuote | LocalVariableDeclExpr |

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
| file://:0:0:0:0 | q2 | LocalVariableDeclExpr |
2-
| file://:0:0:0:0 | q3 | LocalVariableDeclExpr |
3-
| file://:0:0:0:0 | z | LocalVariableDeclExpr |
41
| file://:0:0:0:0 | z | VarAccess |
52
| file://:0:0:0:0 | z | VarAccess |
63
| file://:0:0:0:0 | z | VarAccess |
@@ -25,14 +22,17 @@
2522
| stmts.kt:14:13:14:13 | x | VarAccess |
2623
| stmts.kt:14:13:14:17 | ... < ... | LTExpr |
2724
| stmts.kt:14:17:14:17 | y | VarAccess |
25+
| stmts.kt:15:5:15:13 | z | LocalVariableDeclExpr |
2826
| stmts.kt:15:13:15:13 | 3 | IntegerLiteral |
27+
| stmts.kt:17:5:17:58 | q2 | LocalVariableDeclExpr |
2928
| stmts.kt:17:26:17:58 | true | BooleanLiteral |
3029
| stmts.kt:17:26:17:58 | when ... | WhenExpr |
3130
| stmts.kt:17:29:17:32 | true | BooleanLiteral |
3231
| stmts.kt:17:37:17:37 | ...=... | AssignExpr |
3332
| stmts.kt:17:41:17:41 | 4 | IntegerLiteral |
3433
| stmts.kt:17:52:17:52 | ...=... | AssignExpr |
3534
| stmts.kt:17:56:17:56 | 5 | IntegerLiteral |
35+
| stmts.kt:18:5:18:56 | q3 | LocalVariableDeclExpr |
3636
| stmts.kt:18:26:18:56 | true | BooleanLiteral |
3737
| stmts.kt:18:26:18:56 | when ... | WhenExpr |
3838
| stmts.kt:18:29:18:32 | true | BooleanLiteral |

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,11 @@
1111
| stmts.kt:12:5:14:18 | { ... } | BlockStmt |
1212
| stmts.kt:12:8:14:5 | { ... } | BlockStmt |
1313
| stmts.kt:13:9:13:16 | return ... | ReturnStmt |
14+
| stmts.kt:15:5:15:13 | var ...; | LocalVariableDeclStmt |
15+
| stmts.kt:17:5:17:58 | var ...; | LocalVariableDeclStmt |
1416
| stmts.kt:17:35:17:43 | { ... } | BlockStmt |
1517
| stmts.kt:17:50:17:58 | { ... } | BlockStmt |
18+
| stmts.kt:18:5:18:56 | var ...; | LocalVariableDeclStmt |
1619
| stmts.kt:19:5:19:16 | return ... | ReturnStmt |
1720
| stmts.kt:22:27:30:1 | { ... } | BlockStmt |
1821
| stmts.kt:23:11:27:5 | while (...) | WhileStmt |

0 commit comments

Comments
 (0)