Skip to content

Commit be53ec9

Browse files
smowtonsmowton
committed
Accept test changes
1 parent f9d65e4 commit be53ec9

File tree

3 files changed

+29
-0
lines changed

3 files changed

+29
-0
lines changed

‎java/ql/test/kotlin/library-tests/classes/PrintAst.expected

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -944,6 +944,7 @@ local_anonymous.kt:
944944
# 21| 1: [Constructor]
945945
# 21| 5: [BlockStmt] { ... }
946946
# 21| 0: [SuperConstructorInvocationStmt] super(...)
947+
# 21| 0: [IntegerLiteral] 1
947948
# 21| 2: [Method] invoke
948949
#-----| 4: (Parameters)
949950
# 21| 0: [Parameter] a0

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4139,6 +4139,7 @@ funcExprs.kt:
41394139
# 38| 0: [Parameter] <dispatchReceiver>
41404140
# 38| 5: [BlockStmt] { ... }
41414141
# 38| 0: [SuperConstructorInvocationStmt] super(...)
4142+
# 38| 0: [IntegerLiteral] 0
41424143
# 38| 1: [ExprStmt] <Expr>;
41434144
# 38| 0: [AssignExpr] ...=...
41444145
# 38| 0: [VarAccess] this.<dispatchReceiver>
@@ -4166,6 +4167,7 @@ funcExprs.kt:
41664167
# 39| 0: [Parameter] <dispatchReceiver>
41674168
# 39| 5: [BlockStmt] { ... }
41684169
# 39| 0: [SuperConstructorInvocationStmt] super(...)
4170+
# 39| 0: [IntegerLiteral] 0
41694171
# 39| 1: [ExprStmt] <Expr>;
41704172
# 39| 0: [AssignExpr] ...=...
41714173
# 39| 0: [VarAccess] this.<dispatchReceiver>
@@ -4193,6 +4195,7 @@ funcExprs.kt:
41934195
# 40| 0: [Parameter] <dispatchReceiver>
41944196
# 40| 5: [BlockStmt] { ... }
41954197
# 40| 0: [SuperConstructorInvocationStmt] super(...)
4198+
# 40| 0: [IntegerLiteral] 1
41964199
# 40| 1: [ExprStmt] <Expr>;
41974200
# 40| 0: [AssignExpr] ...=...
41984201
# 40| 0: [VarAccess] this.<dispatchReceiver>
@@ -4223,6 +4226,7 @@ funcExprs.kt:
42234226
# 41| 1: [Constructor]
42244227
# 41| 5: [BlockStmt] { ... }
42254228
# 41| 0: [SuperConstructorInvocationStmt] super(...)
4229+
# 41| 0: [IntegerLiteral] 2
42264230
# 41| 2: [Method] invoke
42274231
#-----| 4: (Parameters)
42284232
# 41| 0: [Parameter] a0
@@ -4247,6 +4251,7 @@ funcExprs.kt:
42474251
# 42| 0: [Parameter] <extensionReceiver>
42484252
# 42| 5: [BlockStmt] { ... }
42494253
# 42| 0: [SuperConstructorInvocationStmt] super(...)
4254+
# 42| 0: [IntegerLiteral] 1
42504255
# 42| 1: [ExprStmt] <Expr>;
42514256
# 42| 0: [AssignExpr] ...=...
42524257
# 42| 0: [VarAccess] this.<extensionReceiver>
@@ -4277,6 +4282,7 @@ funcExprs.kt:
42774282
# 43| 1: [Constructor]
42784283
# 43| 5: [BlockStmt] { ... }
42794284
# 43| 0: [SuperConstructorInvocationStmt] super(...)
4285+
# 43| 0: [IntegerLiteral] 2
42804286
# 43| 2: [Method] invoke
42814287
#-----| 4: (Parameters)
42824288
# 43| 0: [Parameter] a0
@@ -4302,6 +4308,7 @@ funcExprs.kt:
43024308
# 44| 0: [Parameter] <dispatchReceiver>
43034309
# 44| 5: [BlockStmt] { ... }
43044310
# 44| 0: [SuperConstructorInvocationStmt] super(...)
4311+
# 44| 0: [IntegerLiteral] 22
43054312
# 44| 1: [ExprStmt] <Expr>;
43064313
# 44| 0: [AssignExpr] ...=...
43074314
# 44| 0: [VarAccess] this.<dispatchReceiver>
@@ -4397,6 +4404,7 @@ funcExprs.kt:
43974404
# 45| 0: [Parameter] <dispatchReceiver>
43984405
# 45| 5: [BlockStmt] { ... }
43994406
# 45| 0: [SuperConstructorInvocationStmt] super(...)
4407+
# 45| 0: [IntegerLiteral] 23
44004408
# 45| 1: [ExprStmt] <Expr>;
44014409
# 45| 0: [AssignExpr] ...=...
44024410
# 45| 0: [VarAccess] this.<dispatchReceiver>
@@ -4540,6 +4548,7 @@ funcExprs.kt:
45404548
# 46| 1: [Constructor]
45414549
# 46| 5: [BlockStmt] { ... }
45424550
# 46| 0: [SuperConstructorInvocationStmt] super(...)
4551+
# 46| 0: [IntegerLiteral] 24
45434552
# 46| 2: [Method] invoke
45444553
#-----| 4: (Parameters)
45454554
# 46| 0: [Parameter] a0
@@ -4686,6 +4695,7 @@ funcExprs.kt:
46864695
# 49| 1: [Constructor]
46874696
# 49| 5: [BlockStmt] { ... }
46884697
# 49| 0: [SuperConstructorInvocationStmt] super(...)
4698+
# 49| 0: [IntegerLiteral] 0
46894699
# 49| 2: [Method] invoke
46904700
# 49| 5: [BlockStmt] { ... }
46914701
# 49| 0: [ReturnStmt] return ...
@@ -4703,6 +4713,7 @@ funcExprs.kt:
47034713
# 51| 1: [Constructor]
47044714
# 51| 5: [BlockStmt] { ... }
47054715
# 51| 0: [SuperConstructorInvocationStmt] super(...)
4716+
# 51| 0: [IntegerLiteral] 0
47064717
# 51| 2: [Method] invoke
47074718
# 51| 5: [BlockStmt] { ... }
47084719
# 51| 0: [ReturnStmt] return ...
@@ -5316,6 +5327,7 @@ kFunctionInvoke.kt:
53165327
# 8| 0: [Parameter] <dispatchReceiver>
53175328
# 8| 5: [BlockStmt] { ... }
53185329
# 8| 0: [SuperConstructorInvocationStmt] super(...)
5330+
# 8| 0: [IntegerLiteral] 1
53195331
# 8| 1: [ExprStmt] <Expr>;
53205332
# 8| 0: [AssignExpr] ...=...
53215333
# 8| 0: [VarAccess] this.<dispatchReceiver>
@@ -5594,6 +5606,7 @@ samConversion.kt:
55945606
# 5| 1: [Constructor]
55955607
# 5| 5: [BlockStmt] { ... }
55965608
# 5| 0: [SuperConstructorInvocationStmt] super(...)
5609+
# 5| 0: [IntegerLiteral] 2
55975610
# 5| 2: [Method] invoke
55985611
#-----| 4: (Parameters)
55995612
# 5| 0: [Parameter] a0
@@ -5815,6 +5828,7 @@ samConversion.kt:
58155828
# 41| 1: [Constructor]
58165829
# 41| 5: [BlockStmt] { ... }
58175830
# 41| 0: [SuperConstructorInvocationStmt] super(...)
5831+
# 41| 0: [IntegerLiteral] 23
58185832
# 41| 2: [Method] invoke
58195833
#-----| 4: (Parameters)
58205834
# 41| 0: [Parameter] a0

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2487,6 +2487,7 @@
24872487
| funcExprs.kt:38:5:38:39 | functionExpression0a(...) | funcExprs.kt:21:1:52:1 | call | MethodAccess |
24882488
| funcExprs.kt:38:26:38:34 | FuncRef | funcExprs.kt:21:1:52:1 | call | TypeAccess |
24892489
| funcExprs.kt:38:26:38:34 | new FuncRef(...) | funcExprs.kt:21:1:52:1 | call | ClassInstanceExpr |
2490+
| funcExprs.kt:38:26:38:38 | 0 | funcExprs.kt:38:26:38:38 | | IntegerLiteral |
24902491
| funcExprs.kt:38:26:38:38 | ...::... | funcExprs.kt:21:1:52:1 | call | MemberRefExpr |
24912492
| funcExprs.kt:38:26:38:38 | ...=... | funcExprs.kt:38:26:38:38 | | AssignExpr |
24922493
| funcExprs.kt:38:26:38:38 | <dispatchReceiver> | funcExprs.kt:38:26:38:38 | | VarAccess |
@@ -2501,6 +2502,7 @@
25012502
| funcExprs.kt:39:5:39:37 | FuncExprsKt | funcExprs.kt:21:1:52:1 | call | TypeAccess |
25022503
| funcExprs.kt:39:5:39:37 | functionExpression0a(...) | funcExprs.kt:21:1:52:1 | call | MethodAccess |
25032504
| funcExprs.kt:39:26:39:32 | Companion | funcExprs.kt:21:1:52:1 | call | VarAccess |
2505+
| funcExprs.kt:39:26:39:36 | 0 | funcExprs.kt:39:26:39:36 | | IntegerLiteral |
25042506
| funcExprs.kt:39:26:39:36 | ...::... | funcExprs.kt:21:1:52:1 | call | MemberRefExpr |
25052507
| funcExprs.kt:39:26:39:36 | ...=... | funcExprs.kt:39:26:39:36 | | AssignExpr |
25062508
| funcExprs.kt:39:26:39:36 | <dispatchReceiver> | funcExprs.kt:39:26:39:36 | | VarAccess |
@@ -2517,6 +2519,7 @@
25172519
| funcExprs.kt:40:26:40:26 | 5 | funcExprs.kt:21:1:52:1 | call | IntegerLiteral |
25182520
| funcExprs.kt:40:29:40:37 | FuncRef | funcExprs.kt:21:1:52:1 | call | TypeAccess |
25192521
| funcExprs.kt:40:29:40:37 | new FuncRef(...) | funcExprs.kt:21:1:52:1 | call | ClassInstanceExpr |
2522+
| funcExprs.kt:40:29:40:41 | 1 | funcExprs.kt:40:29:40:41 | | IntegerLiteral |
25202523
| funcExprs.kt:40:29:40:41 | ...::... | funcExprs.kt:21:1:52:1 | call | MemberRefExpr |
25212524
| funcExprs.kt:40:29:40:41 | ...=... | funcExprs.kt:40:29:40:41 | | AssignExpr |
25222525
| funcExprs.kt:40:29:40:41 | <dispatchReceiver> | funcExprs.kt:40:29:40:41 | | VarAccess |
@@ -2533,6 +2536,7 @@
25332536
| funcExprs.kt:41:5:41:40 | FuncExprsKt | funcExprs.kt:21:1:52:1 | call | TypeAccess |
25342537
| funcExprs.kt:41:5:41:40 | functionExpression1c(...) | funcExprs.kt:21:1:52:1 | call | MethodAccess |
25352538
| funcExprs.kt:41:26:41:26 | 5 | funcExprs.kt:21:1:52:1 | call | IntegerLiteral |
2539+
| funcExprs.kt:41:29:41:39 | 2 | funcExprs.kt:41:29:41:39 | | IntegerLiteral |
25362540
| funcExprs.kt:41:29:41:39 | ...::... | funcExprs.kt:21:1:52:1 | call | MemberRefExpr |
25372541
| funcExprs.kt:41:29:41:39 | FuncRef | funcExprs.kt:21:1:52:1 | call | TypeAccess |
25382542
| funcExprs.kt:41:29:41:39 | Function2<FuncRef,Integer,Integer> | funcExprs.kt:21:1:52:1 | call | TypeAccess |
@@ -2545,6 +2549,7 @@
25452549
| funcExprs.kt:42:5:42:34 | functionExpression1a(...) | funcExprs.kt:21:1:52:1 | call | MethodAccess |
25462550
| funcExprs.kt:42:26:42:26 | 5 | funcExprs.kt:21:1:52:1 | call | IntegerLiteral |
25472551
| funcExprs.kt:42:29:42:29 | 3 | funcExprs.kt:21:1:52:1 | call | IntegerLiteral |
2552+
| funcExprs.kt:42:29:42:33 | 1 | funcExprs.kt:42:29:42:33 | | IntegerLiteral |
25482553
| funcExprs.kt:42:29:42:33 | ...::... | funcExprs.kt:21:1:52:1 | call | MemberRefExpr |
25492554
| funcExprs.kt:42:29:42:33 | ...=... | funcExprs.kt:42:29:42:33 | | AssignExpr |
25502555
| funcExprs.kt:42:29:42:33 | <extensionReceiver> | funcExprs.kt:42:29:42:33 | | VarAccess |
@@ -2562,6 +2567,7 @@
25622567
| funcExprs.kt:43:5:43:35 | FuncExprsKt | funcExprs.kt:21:1:52:1 | call | TypeAccess |
25632568
| funcExprs.kt:43:5:43:35 | functionExpression3(...) | funcExprs.kt:21:1:52:1 | call | MethodAccess |
25642569
| funcExprs.kt:43:25:43:25 | 5 | funcExprs.kt:21:1:52:1 | call | IntegerLiteral |
2570+
| funcExprs.kt:43:28:43:34 | 2 | funcExprs.kt:43:28:43:34 | | IntegerLiteral |
25652571
| funcExprs.kt:43:28:43:34 | ...::... | funcExprs.kt:21:1:52:1 | call | MemberRefExpr |
25662572
| funcExprs.kt:43:28:43:34 | FuncExprsKt | funcExprs.kt:43:28:43:34 | invoke | TypeAccess |
25672573
| funcExprs.kt:43:28:43:34 | Function2<Integer,Integer,Integer> | funcExprs.kt:21:1:52:1 | call | TypeAccess |
@@ -2576,6 +2582,7 @@
25762582
| funcExprs.kt:44:26:44:26 | 5 | funcExprs.kt:21:1:52:1 | call | IntegerLiteral |
25772583
| funcExprs.kt:44:29:44:37 | FuncRef | funcExprs.kt:21:1:52:1 | call | TypeAccess |
25782584
| funcExprs.kt:44:29:44:37 | new FuncRef(...) | funcExprs.kt:21:1:52:1 | call | ClassInstanceExpr |
2585+
| funcExprs.kt:44:29:44:42 | 22 | funcExprs.kt:44:29:44:42 | | IntegerLiteral |
25792586
| funcExprs.kt:44:29:44:42 | ...::... | funcExprs.kt:21:1:52:1 | call | MemberRefExpr |
25802587
| funcExprs.kt:44:29:44:42 | ...=... | funcExprs.kt:44:29:44:42 | | AssignExpr |
25812588
| funcExprs.kt:44:29:44:42 | <dispatchReceiver> | funcExprs.kt:44:29:44:42 | | VarAccess |
@@ -2659,6 +2666,7 @@
26592666
| funcExprs.kt:45:29:45:42 | 20 | funcExprs.kt:45:29:45:42 | invoke | IntegerLiteral |
26602667
| funcExprs.kt:45:29:45:42 | 21 | funcExprs.kt:45:29:45:42 | invoke | IntegerLiteral |
26612668
| funcExprs.kt:45:29:45:42 | 22 | funcExprs.kt:45:29:45:42 | invoke | IntegerLiteral |
2669+
| funcExprs.kt:45:29:45:42 | 23 | funcExprs.kt:45:29:45:42 | | IntegerLiteral |
26622670
| funcExprs.kt:45:29:45:42 | (...)... | funcExprs.kt:45:29:45:42 | invoke | CastExpr |
26632671
| funcExprs.kt:45:29:45:42 | (...)... | funcExprs.kt:45:29:45:42 | invoke | CastExpr |
26642672
| funcExprs.kt:45:29:45:42 | (...)... | funcExprs.kt:45:29:45:42 | invoke | CastExpr |
@@ -2789,6 +2797,7 @@
27892797
| funcExprs.kt:46:30:46:41 | 21 | funcExprs.kt:46:30:46:41 | invoke | IntegerLiteral |
27902798
| funcExprs.kt:46:30:46:41 | 22 | funcExprs.kt:46:30:46:41 | invoke | IntegerLiteral |
27912799
| funcExprs.kt:46:30:46:41 | 23 | funcExprs.kt:46:30:46:41 | invoke | IntegerLiteral |
2800+
| funcExprs.kt:46:30:46:41 | 24 | funcExprs.kt:46:30:46:41 | | IntegerLiteral |
27922801
| funcExprs.kt:46:30:46:41 | (...)... | funcExprs.kt:46:30:46:41 | invoke | CastExpr |
27932802
| funcExprs.kt:46:30:46:41 | (...)... | funcExprs.kt:46:30:46:41 | invoke | CastExpr |
27942803
| funcExprs.kt:46:30:46:41 | (...)... | funcExprs.kt:46:30:46:41 | invoke | CastExpr |
@@ -2893,6 +2902,7 @@
28932902
| funcExprs.kt:48:24:48:24 | 5 | funcExprs.kt:48:5:48:24 | local | IntegerLiteral |
28942903
| funcExprs.kt:49:5:49:33 | FuncExprsKt | funcExprs.kt:21:1:52:1 | call | TypeAccess |
28952904
| funcExprs.kt:49:5:49:33 | functionExpression0a(...) | funcExprs.kt:21:1:52:1 | call | MethodAccess |
2905+
| funcExprs.kt:49:26:49:32 | 0 | funcExprs.kt:49:26:49:32 | | IntegerLiteral |
28962906
| funcExprs.kt:49:26:49:32 | ...::... | funcExprs.kt:21:1:52:1 | call | MemberRefExpr |
28972907
| funcExprs.kt:49:26:49:32 | Function0<Integer> | funcExprs.kt:21:1:52:1 | call | TypeAccess |
28982908
| funcExprs.kt:49:26:49:32 | Integer | funcExprs.kt:21:1:52:1 | call | TypeAccess |
@@ -2902,6 +2912,7 @@
29022912
| funcExprs.kt:51:5:51:17 | FuncExprsKt | funcExprs.kt:21:1:52:1 | call | TypeAccess |
29032913
| funcExprs.kt:51:5:51:17 | FuncRef | funcExprs.kt:21:1:52:1 | call | TypeAccess |
29042914
| funcExprs.kt:51:5:51:17 | fn(...) | funcExprs.kt:21:1:52:1 | call | MethodAccess |
2915+
| funcExprs.kt:51:8:51:16 | 0 | funcExprs.kt:51:8:51:16 | | IntegerLiteral |
29052916
| funcExprs.kt:51:8:51:16 | ...::... | funcExprs.kt:21:1:52:1 | call | MemberRefExpr |
29062917
| funcExprs.kt:51:8:51:16 | FuncRef | funcExprs.kt:21:1:52:1 | call | TypeAccess |
29072918
| funcExprs.kt:51:8:51:16 | FuncRef | funcExprs.kt:51:8:51:16 | invoke | TypeAccess |
@@ -3283,6 +3294,7 @@
32833294
| kFunctionInvoke.kt:7:18:7:26 | String | file://:0:0:0:0 | <none> | TypeAccess |
32843295
| kFunctionInvoke.kt:8:5:8:47 | toCall | kFunctionInvoke.kt:7:1:10:1 | useRef | LocalVariableDeclExpr |
32853296
| kFunctionInvoke.kt:8:44:8:44 | a | kFunctionInvoke.kt:7:1:10:1 | useRef | VarAccess |
3297+
| kFunctionInvoke.kt:8:44:8:47 | 1 | kFunctionInvoke.kt:8:44:8:47 | | IntegerLiteral |
32863298
| kFunctionInvoke.kt:8:44:8:47 | ...::... | kFunctionInvoke.kt:7:1:10:1 | useRef | MemberRefExpr |
32873299
| kFunctionInvoke.kt:8:44:8:47 | ...=... | kFunctionInvoke.kt:8:44:8:47 | | AssignExpr |
32883300
| kFunctionInvoke.kt:8:44:8:47 | <dispatchReceiver> | kFunctionInvoke.kt:8:44:8:47 | | VarAccess |
@@ -3424,6 +3436,7 @@
34243436
| samConversion.kt:5:14:5:32 | new (...) | samConversion.kt:1:1:14:1 | main | ClassInstanceExpr |
34253437
| samConversion.kt:5:14:5:32 | this | samConversion.kt:5:14:5:32 | | ThisAccess |
34263438
| samConversion.kt:5:14:5:32 | this.<fn> | samConversion.kt:5:14:5:32 | | VarAccess |
3439+
| samConversion.kt:5:27:5:31 | 2 | samConversion.kt:5:27:5:31 | | IntegerLiteral |
34273440
| samConversion.kt:5:27:5:31 | ...::... | samConversion.kt:1:1:14:1 | main | MemberRefExpr |
34283441
| samConversion.kt:5:27:5:31 | Function2<Integer,Integer,Unit> | samConversion.kt:1:1:14:1 | main | TypeAccess |
34293442
| samConversion.kt:5:27:5:31 | Integer | samConversion.kt:1:1:14:1 | main | TypeAccess |
@@ -3592,6 +3605,7 @@
35923605
| samConversion.kt:41:13:41:16 | 20 | samConversion.kt:41:13:41:16 | invoke | IntegerLiteral |
35933606
| samConversion.kt:41:13:41:16 | 21 | samConversion.kt:41:13:41:16 | invoke | IntegerLiteral |
35943607
| samConversion.kt:41:13:41:16 | 22 | samConversion.kt:41:13:41:16 | invoke | IntegerLiteral |
3608+
| samConversion.kt:41:13:41:16 | 23 | samConversion.kt:41:13:41:16 | | IntegerLiteral |
35953609
| samConversion.kt:41:13:41:16 | (...)... | samConversion.kt:41:13:41:16 | invoke | CastExpr |
35963610
| samConversion.kt:41:13:41:16 | (...)... | samConversion.kt:41:13:41:16 | invoke | CastExpr |
35973611
| samConversion.kt:41:13:41:16 | (...)... | samConversion.kt:41:13:41:16 | invoke | CastExpr |

0 commit comments

Comments
 (0)