Skip to content

Commit 92d3d9d

Browse files
smowtonsmowton
authored
Update integration test expectations
1 parent 4205f1b commit 92d3d9d

File tree

3 files changed

+50
-50
lines changed

3 files changed

+50
-50
lines changed

‎java/ql/integration-tests/all-platforms/kotlin/annotation-id-consistency/PrintAst.expected

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ User.java:
1010
# 3| 0: [TypeAccess] Ann2
1111
# 3| 5: [BlockStmt] { ... }
1212
# 4| 0: [ExprStmt] <Expr>;
13-
# 4| 0: [MethodAccess] x(...)
13+
# 4| 0: [MethodCall] x(...)
1414
# 4| -1: [VarAccess] a1
1515
# 4| 1: [ExprStmt] <Expr>;
16-
# 4| 0: [MethodAccess] z(...)
16+
# 4| 0: [MethodCall] z(...)
1717
# 4| -1: [VarAccess] a2
1818
# 4| 2: [ExprStmt] <Expr>;
1919
# 4| 0: [ClassInstanceExpr] new Annotated(...)
@@ -49,7 +49,7 @@ ktUser.kt:
4949
# 8| 3: [ExprStmt] <Expr>;
5050
# 8| 0: [ImplicitCoercionToUnitExpr] <implicit coercion to unit>
5151
# 8| 0: [TypeAccess] Unit
52-
# 8| 1: [MethodAccess] isJavaLetter(...)
52+
# 8| 1: [MethodCall] isJavaLetter(...)
5353
# 8| -1: [TypeAccess] Character
5454
# 8| 0: [CharacterLiteral] a
5555
test.kt:

‎java/ql/integration-tests/all-platforms/kotlin/gradle_kotlinx_serialization/PrintAst.expected

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ app/src/main/kotlin/testProject/App.kt:
3131
# 7| 0: [IntegerLiteral] 3
3232
# 7| 1: [VarAccess] seen1
3333
# 7| 1: [ExprStmt] <Expr>;
34-
# 7| 0: [MethodAccess] throwMissingFieldException(...)
34+
# 7| 0: [MethodCall] throwMissingFieldException(...)
3535
# 7| -1: [TypeAccess] PluginExceptionsKt
3636
# 7| 0: [VarAccess] seen1
3737
# 7| 1: [IntegerLiteral] 3
38-
# 7| 2: [MethodAccess] getDescriptor(...)
38+
# 7| 2: [MethodCall] getDescriptor(...)
3939
# 7| -1: [VarAccess] INSTANCE
4040
# 7| 1: [SuperConstructorInvocationStmt] super(...)
4141
# 7| 2: [ExprStmt] <Expr>;
@@ -118,7 +118,7 @@ app/src/main/kotlin/testProject/App.kt:
118118
# 0| 1: [VarAccess] p0.language
119119
# 0| -1: [VarAccess] p0
120120
# 0| 2: [ReturnStmt] return ...
121-
# 0| 0: [MethodAccess] copy(...)
121+
# 0| 0: [MethodCall] copy(...)
122122
# 0| -1: [VarAccess] p0
123123
# 0| 0: [VarAccess] p1
124124
# 0| 1: [VarAccess] p2
@@ -176,7 +176,7 @@ app/src/main/kotlin/testProject/App.kt:
176176
# 0| 5: [BlockStmt] { ... }
177177
# 0| 0: [LocalVariableDeclStmt] var ...;
178178
# 0| 1: [LocalVariableDeclExpr] result
179-
# 0| 0: [MethodAccess] hashCode(...)
179+
# 0| 0: [MethodCall] hashCode(...)
180180
# 0| -1: [VarAccess] this.name
181181
# 0| -1: [ThisAccess] this
182182
# 0| 1: [ExprStmt] <Expr>;
@@ -186,7 +186,7 @@ app/src/main/kotlin/testProject/App.kt:
186186
# 0| 0: [MulExpr] ... * ...
187187
# 0| 0: [VarAccess] result
188188
# 0| 1: [IntegerLiteral] 31
189-
# 0| 1: [MethodAccess] hashCode(...)
189+
# 0| 1: [MethodCall] hashCode(...)
190190
# 0| -1: [VarAccess] this.language
191191
# 0| -1: [ThisAccess] this
192192
# 0| 2: [ReturnStmt] return ...
@@ -226,18 +226,18 @@ app/src/main/kotlin/testProject/App.kt:
226226
# 0| 0: [TypeAccess] SerialDescriptor
227227
# 7| 5: [BlockStmt] { ... }
228228
# 7| 0: [ExprStmt] <Expr>;
229-
# 7| 0: [MethodAccess] encodeStringElement(...)
229+
# 7| 0: [MethodCall] encodeStringElement(...)
230230
# 7| -1: [VarAccess] output
231231
# 7| 0: [VarAccess] serialDesc
232232
# 7| 1: [IntegerLiteral] 0
233-
# 7| 2: [MethodAccess] getName(...)
233+
# 7| 2: [MethodCall] getName(...)
234234
# 7| -1: [VarAccess] self
235235
# 7| 1: [ExprStmt] <Expr>;
236-
# 7| 0: [MethodAccess] encodeIntElement(...)
236+
# 7| 0: [MethodCall] encodeIntElement(...)
237237
# 7| -1: [VarAccess] output
238238
# 7| 0: [VarAccess] serialDesc
239239
# 7| 1: [IntegerLiteral] 1
240-
# 7| 2: [MethodAccess] getLanguage(...)
240+
# 7| 2: [MethodCall] getLanguage(...)
241241
# 7| -1: [VarAccess] self
242242
# 7| 10: [Class] $serializer
243243
#-----| -3: (Annotations)
@@ -274,7 +274,7 @@ app/src/main/kotlin/testProject/App.kt:
274274
# 7| 5: [BlockStmt] { ... }
275275
# 7| 0: [LocalVariableDeclStmt] var ...;
276276
# 7| 1: [LocalVariableDeclExpr] tmp0_desc
277-
# 7| 0: [MethodAccess] getDescriptor(...)
277+
# 7| 0: [MethodCall] getDescriptor(...)
278278
# 7| -1: [ThisAccess] this
279279
# 7| 1: [LocalVariableDeclStmt] var ...;
280280
# 7| 1: [LocalVariableDeclExpr] tmp1_flag
@@ -293,20 +293,20 @@ app/src/main/kotlin/testProject/App.kt:
293293
# 7| 0: [IntegerLiteral] 0
294294
# 7| 6: [LocalVariableDeclStmt] var ...;
295295
# 7| 1: [LocalVariableDeclExpr] tmp6_input
296-
# 7| 0: [MethodAccess] beginStructure(...)
296+
# 7| 0: [MethodCall] beginStructure(...)
297297
# 7| -1: [VarAccess] decoder
298298
# 7| 0: [VarAccess] tmp0_desc
299299
# 7| 7: [ExprStmt] <Expr>;
300300
# 7| 0: [WhenExpr] when ...
301301
# 7| 0: [WhenBranch] ... -> ...
302-
# 7| 0: [MethodAccess] decodeSequentially(...)
302+
# 7| 0: [MethodCall] decodeSequentially(...)
303303
# 7| -1: [VarAccess] tmp6_input
304304
# 7| 1: [BlockStmt] { ... }
305305
# 7| 0: [BlockStmt] { ... }
306306
# 7| 0: [ExprStmt] <Expr>;
307307
# 7| 0: [AssignExpr] ...=...
308308
# 7| 0: [VarAccess] tmp4_local0
309-
# 7| 1: [MethodAccess] decodeStringElement(...)
309+
# 7| 1: [MethodCall] decodeStringElement(...)
310310
# 7| -1: [VarAccess] tmp6_input
311311
# 7| 0: [VarAccess] tmp0_desc
312312
# 7| 1: [IntegerLiteral] 0
@@ -320,7 +320,7 @@ app/src/main/kotlin/testProject/App.kt:
320320
# 7| 0: [ExprStmt] <Expr>;
321321
# 7| 0: [AssignExpr] ...=...
322322
# 7| 0: [VarAccess] tmp5_local1
323-
# 7| 1: [MethodAccess] decodeIntElement(...)
323+
# 7| 1: [MethodCall] decodeIntElement(...)
324324
# 7| -1: [VarAccess] tmp6_input
325325
# 7| 0: [VarAccess] tmp0_desc
326326
# 7| 1: [IntegerLiteral] 1
@@ -338,7 +338,7 @@ app/src/main/kotlin/testProject/App.kt:
338338
# 7| 0: [ExprStmt] <Expr>;
339339
# 7| 0: [AssignExpr] ...=...
340340
# 7| 0: [VarAccess] tmp2_index
341-
# 7| 1: [MethodAccess] decodeElementIndex(...)
341+
# 7| 1: [MethodCall] decodeElementIndex(...)
342342
# 7| -1: [VarAccess] tmp6_input
343343
# 7| 0: [VarAccess] tmp0_desc
344344
# 7| 1: [ExprStmt] <Expr>;
@@ -359,7 +359,7 @@ app/src/main/kotlin/testProject/App.kt:
359359
# 7| 0: [ExprStmt] <Expr>;
360360
# 7| 0: [AssignExpr] ...=...
361361
# 7| 0: [VarAccess] tmp4_local0
362-
# 7| 1: [MethodAccess] decodeStringElement(...)
362+
# 7| 1: [MethodCall] decodeStringElement(...)
363363
# 7| -1: [VarAccess] tmp6_input
364364
# 7| 0: [VarAccess] tmp0_desc
365365
# 7| 1: [IntegerLiteral] 0
@@ -377,7 +377,7 @@ app/src/main/kotlin/testProject/App.kt:
377377
# 7| 0: [ExprStmt] <Expr>;
378378
# 7| 0: [AssignExpr] ...=...
379379
# 7| 0: [VarAccess] tmp5_local1
380-
# 7| 1: [MethodAccess] decodeIntElement(...)
380+
# 7| 1: [MethodCall] decodeIntElement(...)
381381
# 7| -1: [VarAccess] tmp6_input
382382
# 7| 0: [VarAccess] tmp0_desc
383383
# 7| 1: [IntegerLiteral] 1
@@ -394,7 +394,7 @@ app/src/main/kotlin/testProject/App.kt:
394394
# 7| -3: [TypeAccess] UnknownFieldException
395395
# 7| 0: [VarAccess] tmp2_index
396396
# 7| 8: [ExprStmt] <Expr>;
397-
# 7| 0: [MethodAccess] endStructure(...)
397+
# 7| 0: [MethodCall] endStructure(...)
398398
# 7| -1: [VarAccess] tmp6_input
399399
# 7| 0: [VarAccess] tmp0_desc
400400
# 7| 9: [ReturnStmt] return ...
@@ -426,21 +426,21 @@ app/src/main/kotlin/testProject/App.kt:
426426
# 7| 5: [BlockStmt] { ... }
427427
# 7| 0: [LocalVariableDeclStmt] var ...;
428428
# 7| 1: [LocalVariableDeclExpr] tmp0_desc
429-
# 7| 0: [MethodAccess] getDescriptor(...)
429+
# 7| 0: [MethodCall] getDescriptor(...)
430430
# 7| -1: [ThisAccess] this
431431
# 7| 1: [LocalVariableDeclStmt] var ...;
432432
# 7| 1: [LocalVariableDeclExpr] tmp1_output
433-
# 7| 0: [MethodAccess] beginStructure(...)
433+
# 7| 0: [MethodCall] beginStructure(...)
434434
# 7| -1: [VarAccess] encoder
435435
# 7| 0: [VarAccess] tmp0_desc
436436
# 7| 2: [ExprStmt] <Expr>;
437-
# 7| 0: [MethodAccess] write$Self(...)
437+
# 7| 0: [MethodCall] write$Self(...)
438438
# 7| -1: [TypeAccess] Project
439439
# 7| 0: [VarAccess] value
440440
# 7| 1: [VarAccess] tmp1_output
441441
# 7| 2: [VarAccess] tmp0_desc
442442
# 7| 3: [ExprStmt] <Expr>;
443-
# 7| 0: [MethodAccess] endStructure(...)
443+
# 7| 0: [MethodCall] endStructure(...)
444444
# 7| -1: [VarAccess] tmp1_output
445445
# 7| 0: [VarAccess] tmp0_desc
446446
# 7| 6: [Constructor] $serializer
@@ -456,12 +456,12 @@ app/src/main/kotlin/testProject/App.kt:
456456
# 7| 0: [TypeAccess] $serializer
457457
# 7| 2: [IntegerLiteral] 2
458458
# 7| 1: [ExprStmt] <Expr>;
459-
# 7| 0: [MethodAccess] addElement(...)
459+
# 7| 0: [MethodCall] addElement(...)
460460
# 7| -1: [VarAccess] tmp0_serialDesc
461461
# 7| 0: [StringLiteral] "name"
462462
# 7| 1: [BooleanLiteral] false
463463
# 7| 2: [ExprStmt] <Expr>;
464-
# 7| 0: [MethodAccess] addElement(...)
464+
# 7| 0: [MethodCall] addElement(...)
465465
# 7| -1: [VarAccess] tmp0_serialDesc
466466
# 7| 0: [StringLiteral] "language"
467467
# 7| 1: [BooleanLiteral] false
@@ -477,7 +477,7 @@ app/src/main/kotlin/testProject/App.kt:
477477
# 7| 0: [WildcardTypeAccess] ? ...
478478
# 7| 5: [BlockStmt] { ... }
479479
# 7| 0: [ReturnStmt] return ...
480-
# 7| 0: [MethodAccess] typeParametersSerializers(...)
480+
# 7| 0: [MethodCall] typeParametersSerializers(...)
481481
# 7| -1: [SuperAccess] GeneratedSerializer.super
482482
# 7| 0: [TypeAccess] GeneratedSerializer
483483
# 7| 11: [Class] Companion
@@ -564,11 +564,11 @@ app/src/main/kotlin/testProject/App.kt:
564564
# 14| 0: [IntegerLiteral] 0
565565
# 14| 1: [VarAccess] seen1
566566
# 14| 1: [ExprStmt] <Expr>;
567-
# 14| 0: [MethodAccess] throwMissingFieldException(...)
567+
# 14| 0: [MethodCall] throwMissingFieldException(...)
568568
# 14| -1: [TypeAccess] PluginExceptionsKt
569569
# 14| 0: [VarAccess] seen1
570570
# 14| 1: [IntegerLiteral] 0
571-
# 14| 2: [MethodAccess] getDescriptor(...)
571+
# 14| 2: [MethodCall] getDescriptor(...)
572572
# 14| -1: [VarAccess] INSTANCE
573573
# 14| 1: [SuperConstructorInvocationStmt] super(...)
574574
# 14| 2: [ExprStmt] <Expr>;
@@ -616,7 +616,7 @@ app/src/main/kotlin/testProject/App.kt:
616616
# 14| 0: [WhenBranch] ... -> ...
617617
# 14| 0: [WhenExpr] when ...
618618
# 14| 0: [WhenBranch] ... -> ...
619-
# 14| 0: [MethodAccess] shouldEncodeElementDefault(...)
619+
# 14| 0: [MethodCall] shouldEncodeElementDefault(...)
620620
# 14| -1: [VarAccess] output
621621
# 14| 0: [VarAccess] serialDesc
622622
# 14| 1: [IntegerLiteral] 0
@@ -626,15 +626,15 @@ app/src/main/kotlin/testProject/App.kt:
626626
# 14| 0: [BooleanLiteral] true
627627
# 14| 1: [ExprStmt] <Expr>;
628628
# 14| 0: [ValueNEExpr] ... (value not-equals) ...
629-
# 14| 0: [MethodAccess] getId(...)
629+
# 14| 0: [MethodCall] getId(...)
630630
# 14| -1: [VarAccess] self
631631
# 16| 1: [StringLiteral] "X"
632632
# 14| 1: [ExprStmt] <Expr>;
633-
# 14| 0: [MethodAccess] encodeStringElement(...)
633+
# 14| 0: [MethodCall] encodeStringElement(...)
634634
# 14| -1: [VarAccess] output
635635
# 14| 0: [VarAccess] serialDesc
636636
# 14| 1: [IntegerLiteral] 0
637-
# 14| 2: [MethodAccess] getId(...)
637+
# 14| 2: [MethodCall] getId(...)
638638
# 14| -1: [VarAccess] self
639639
# 14| 3: [Class] $serializer
640640
#-----| -3: (Annotations)
@@ -671,7 +671,7 @@ app/src/main/kotlin/testProject/App.kt:
671671
# 14| 5: [BlockStmt] { ... }
672672
# 14| 0: [LocalVariableDeclStmt] var ...;
673673
# 14| 1: [LocalVariableDeclExpr] tmp0_desc
674-
# 14| 0: [MethodAccess] getDescriptor(...)
674+
# 14| 0: [MethodCall] getDescriptor(...)
675675
# 14| -1: [ThisAccess] this
676676
# 14| 1: [LocalVariableDeclStmt] var ...;
677677
# 14| 1: [LocalVariableDeclExpr] tmp1_flag
@@ -687,20 +687,20 @@ app/src/main/kotlin/testProject/App.kt:
687687
# 14| 0: [NullLiteral] null
688688
# 14| 5: [LocalVariableDeclStmt] var ...;
689689
# 14| 1: [LocalVariableDeclExpr] tmp5_input
690-
# 14| 0: [MethodAccess] beginStructure(...)
690+
# 14| 0: [MethodCall] beginStructure(...)
691691
# 14| -1: [VarAccess] decoder
692692
# 14| 0: [VarAccess] tmp0_desc
693693
# 14| 6: [ExprStmt] <Expr>;
694694
# 14| 0: [WhenExpr] when ...
695695
# 14| 0: [WhenBranch] ... -> ...
696-
# 14| 0: [MethodAccess] decodeSequentially(...)
696+
# 14| 0: [MethodCall] decodeSequentially(...)
697697
# 14| -1: [VarAccess] tmp5_input
698698
# 14| 1: [BlockStmt] { ... }
699699
# 14| 0: [BlockStmt] { ... }
700700
# 14| 0: [ExprStmt] <Expr>;
701701
# 14| 0: [AssignExpr] ...=...
702702
# 14| 0: [VarAccess] tmp4_local0
703-
# 14| 1: [MethodAccess] decodeStringElement(...)
703+
# 14| 1: [MethodCall] decodeStringElement(...)
704704
# 14| -1: [VarAccess] tmp5_input
705705
# 14| 0: [VarAccess] tmp0_desc
706706
# 14| 1: [IntegerLiteral] 0
@@ -718,7 +718,7 @@ app/src/main/kotlin/testProject/App.kt:
718718
# 14| 0: [ExprStmt] <Expr>;
719719
# 14| 0: [AssignExpr] ...=...
720720
# 14| 0: [VarAccess] tmp2_index
721-
# 14| 1: [MethodAccess] decodeElementIndex(...)
721+
# 14| 1: [MethodCall] decodeElementIndex(...)
722722
# 14| -1: [VarAccess] tmp5_input
723723
# 14| 0: [VarAccess] tmp0_desc
724724
# 14| 1: [ExprStmt] <Expr>;
@@ -739,7 +739,7 @@ app/src/main/kotlin/testProject/App.kt:
739739
# 14| 0: [ExprStmt] <Expr>;
740740
# 14| 0: [AssignExpr] ...=...
741741
# 14| 0: [VarAccess] tmp4_local0
742-
# 14| 1: [MethodAccess] decodeStringElement(...)
742+
# 14| 1: [MethodCall] decodeStringElement(...)
743743
# 14| -1: [VarAccess] tmp5_input
744744
# 14| 0: [VarAccess] tmp0_desc
745745
# 14| 1: [IntegerLiteral] 0
@@ -756,7 +756,7 @@ app/src/main/kotlin/testProject/App.kt:
756756
# 14| -3: [TypeAccess] UnknownFieldException
757757
# 14| 0: [VarAccess] tmp2_index
758758
# 14| 7: [ExprStmt] <Expr>;
759-
# 14| 0: [MethodAccess] endStructure(...)
759+
# 14| 0: [MethodCall] endStructure(...)
760760
# 14| -1: [VarAccess] tmp5_input
761761
# 14| 0: [VarAccess] tmp0_desc
762762
# 14| 8: [ReturnStmt] return ...
@@ -787,21 +787,21 @@ app/src/main/kotlin/testProject/App.kt:
787787
# 14| 5: [BlockStmt] { ... }
788788
# 14| 0: [LocalVariableDeclStmt] var ...;
789789
# 14| 1: [LocalVariableDeclExpr] tmp0_desc
790-
# 14| 0: [MethodAccess] getDescriptor(...)
790+
# 14| 0: [MethodCall] getDescriptor(...)
791791
# 14| -1: [ThisAccess] this
792792
# 14| 1: [LocalVariableDeclStmt] var ...;
793793
# 14| 1: [LocalVariableDeclExpr] tmp1_output
794-
# 14| 0: [MethodAccess] beginStructure(...)
794+
# 14| 0: [MethodCall] beginStructure(...)
795795
# 14| -1: [VarAccess] encoder
796796
# 14| 0: [VarAccess] tmp0_desc
797797
# 14| 2: [ExprStmt] <Expr>;
798-
# 14| 0: [MethodAccess] write$Self(...)
798+
# 14| 0: [MethodCall] write$Self(...)
799799
# 14| -1: [TypeAccess] X
800800
# 14| 0: [VarAccess] value
801801
# 14| 1: [VarAccess] tmp1_output
802802
# 14| 2: [VarAccess] tmp0_desc
803803
# 14| 3: [ExprStmt] <Expr>;
804-
# 14| 0: [MethodAccess] endStructure(...)
804+
# 14| 0: [MethodCall] endStructure(...)
805805
# 14| -1: [VarAccess] tmp1_output
806806
# 14| 0: [VarAccess] tmp0_desc
807807
# 14| 6: [Constructor] $serializer
@@ -817,7 +817,7 @@ app/src/main/kotlin/testProject/App.kt:
817817
# 14| 0: [TypeAccess] $serializer
818818
# 14| 2: [IntegerLiteral] 1
819819
# 14| 1: [ExprStmt] <Expr>;
820-
# 14| 0: [MethodAccess] addElement(...)
820+
# 14| 0: [MethodCall] addElement(...)
821821
# 14| -1: [VarAccess] tmp0_serialDesc
822822
# 14| 0: [StringLiteral] "id"
823823
# 14| 1: [BooleanLiteral] true
@@ -833,7 +833,7 @@ app/src/main/kotlin/testProject/App.kt:
833833
# 14| 0: [WildcardTypeAccess] ? ...
834834
# 14| 5: [BlockStmt] { ... }
835835
# 14| 0: [ReturnStmt] return ...
836-
# 14| 0: [MethodAccess] typeParametersSerializers(...)
836+
# 14| 0: [MethodCall] typeParametersSerializers(...)
837837
# 14| -1: [SuperAccess] GeneratedSerializer.super
838838
# 14| 0: [TypeAccess] GeneratedSerializer
839839
# 14| 4: [Class] Companion

0 commit comments

Comments
 (0)