Skip to content

Commit 73fe20f

Browse files
igfooigfoo
authored
Merge pull request #15713 from igfoo/igfoo/past
Kotlin 2: Accept some PrintAst changes in library-tests/exprs
2 parents 1f3a349 + bfea40f commit 73fe20f

File tree

1 file changed

+38
-38
lines changed

1 file changed

+38
-38
lines changed

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

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -2933,15 +2933,15 @@ exprs.kt:
29332933
# 292| 1: [StmtExpr] <Stmt>
29342934
# 292| 0: [BlockStmt] { ... }
29352935
# 292| 0: [LocalVariableDeclStmt] var ...;
2936-
# 292| 1: [LocalVariableDeclExpr] tmp0
2936+
# 292| 1: [LocalVariableDeclExpr] <unary>
29372937
# 292| 0: [VarAccess] i0
29382938
# 292| 1: [ExprStmt] <Expr>;
29392939
# 292| 0: [AssignExpr] ...=...
29402940
# 292| 0: [VarAccess] i0
29412941
# 292| 1: [MethodCall] inc(...)
2942-
# 292| -1: [VarAccess] tmp0
2942+
# 292| -1: [VarAccess] <unary>
29432943
# 292| 2: [ExprStmt] <Expr>;
2944-
# 292| 0: [VarAccess] tmp0
2944+
# 292| 0: [VarAccess] <unary>
29452945
# 293| 7: [ExprStmt] <Expr>;
29462946
# 293| 0: [ImplicitCoercionToUnitExpr] <implicit coercion to unit>
29472947
# 293| 0: [TypeAccess] Unit
@@ -2960,15 +2960,15 @@ exprs.kt:
29602960
# 294| 1: [StmtExpr] <Stmt>
29612961
# 294| 0: [BlockStmt] { ... }
29622962
# 294| 0: [LocalVariableDeclStmt] var ...;
2963-
# 294| 1: [LocalVariableDeclExpr] tmp1
2963+
# 294| 1: [LocalVariableDeclExpr] <unary>
29642964
# 294| 0: [VarAccess] i0
29652965
# 294| 1: [ExprStmt] <Expr>;
29662966
# 294| 0: [AssignExpr] ...=...
29672967
# 294| 0: [VarAccess] i0
29682968
# 294| 1: [MethodCall] dec(...)
2969-
# 294| -1: [VarAccess] tmp1
2969+
# 294| -1: [VarAccess] <unary>
29702970
# 294| 2: [ExprStmt] <Expr>;
2971-
# 294| 0: [VarAccess] tmp1
2971+
# 294| 0: [VarAccess] <unary>
29722972
# 295| 9: [ExprStmt] <Expr>;
29732973
# 295| 0: [ImplicitCoercionToUnitExpr] <implicit coercion to unit>
29742974
# 295| 0: [TypeAccess] Unit
@@ -3028,15 +3028,15 @@ exprs.kt:
30283028
# 306| 1: [StmtExpr] <Stmt>
30293029
# 306| 0: [BlockStmt] { ... }
30303030
# 306| 0: [LocalVariableDeclStmt] var ...;
3031-
# 306| 1: [LocalVariableDeclExpr] tmp2
3031+
# 306| 1: [LocalVariableDeclExpr] <unary>
30323032
# 306| 0: [VarAccess] b0
30333033
# 306| 1: [ExprStmt] <Expr>;
30343034
# 306| 0: [AssignExpr] ...=...
30353035
# 306| 0: [VarAccess] b0
30363036
# 306| 1: [MethodCall] inc(...)
3037-
# 306| -1: [VarAccess] tmp2
3037+
# 306| -1: [VarAccess] <unary>
30383038
# 306| 2: [ExprStmt] <Expr>;
3039-
# 306| 0: [VarAccess] tmp2
3039+
# 306| 0: [VarAccess] <unary>
30403040
# 307| 20: [ExprStmt] <Expr>;
30413041
# 307| 0: [ImplicitCoercionToUnitExpr] <implicit coercion to unit>
30423042
# 307| 0: [TypeAccess] Unit
@@ -3055,15 +3055,15 @@ exprs.kt:
30553055
# 308| 1: [StmtExpr] <Stmt>
30563056
# 308| 0: [BlockStmt] { ... }
30573057
# 308| 0: [LocalVariableDeclStmt] var ...;
3058-
# 308| 1: [LocalVariableDeclExpr] tmp3
3058+
# 308| 1: [LocalVariableDeclExpr] <unary>
30593059
# 308| 0: [VarAccess] b0
30603060
# 308| 1: [ExprStmt] <Expr>;
30613061
# 308| 0: [AssignExpr] ...=...
30623062
# 308| 0: [VarAccess] b0
30633063
# 308| 1: [MethodCall] dec(...)
3064-
# 308| -1: [VarAccess] tmp3
3064+
# 308| -1: [VarAccess] <unary>
30653065
# 308| 2: [ExprStmt] <Expr>;
3066-
# 308| 0: [VarAccess] tmp3
3066+
# 308| 0: [VarAccess] <unary>
30673067
# 309| 22: [ExprStmt] <Expr>;
30683068
# 309| 0: [ImplicitCoercionToUnitExpr] <implicit coercion to unit>
30693069
# 309| 0: [TypeAccess] Unit
@@ -3123,15 +3123,15 @@ exprs.kt:
31233123
# 320| 1: [StmtExpr] <Stmt>
31243124
# 320| 0: [BlockStmt] { ... }
31253125
# 320| 0: [LocalVariableDeclStmt] var ...;
3126-
# 320| 1: [LocalVariableDeclExpr] tmp4
3126+
# 320| 1: [LocalVariableDeclExpr] <unary>
31273127
# 320| 0: [VarAccess] s0
31283128
# 320| 1: [ExprStmt] <Expr>;
31293129
# 320| 0: [AssignExpr] ...=...
31303130
# 320| 0: [VarAccess] s0
31313131
# 320| 1: [MethodCall] inc(...)
3132-
# 320| -1: [VarAccess] tmp4
3132+
# 320| -1: [VarAccess] <unary>
31333133
# 320| 2: [ExprStmt] <Expr>;
3134-
# 320| 0: [VarAccess] tmp4
3134+
# 320| 0: [VarAccess] <unary>
31353135
# 321| 33: [ExprStmt] <Expr>;
31363136
# 321| 0: [ImplicitCoercionToUnitExpr] <implicit coercion to unit>
31373137
# 321| 0: [TypeAccess] Unit
@@ -3150,15 +3150,15 @@ exprs.kt:
31503150
# 322| 1: [StmtExpr] <Stmt>
31513151
# 322| 0: [BlockStmt] { ... }
31523152
# 322| 0: [LocalVariableDeclStmt] var ...;
3153-
# 322| 1: [LocalVariableDeclExpr] tmp5
3153+
# 322| 1: [LocalVariableDeclExpr] <unary>
31543154
# 322| 0: [VarAccess] s0
31553155
# 322| 1: [ExprStmt] <Expr>;
31563156
# 322| 0: [AssignExpr] ...=...
31573157
# 322| 0: [VarAccess] s0
31583158
# 322| 1: [MethodCall] dec(...)
3159-
# 322| -1: [VarAccess] tmp5
3159+
# 322| -1: [VarAccess] <unary>
31603160
# 322| 2: [ExprStmt] <Expr>;
3161-
# 322| 0: [VarAccess] tmp5
3161+
# 322| 0: [VarAccess] <unary>
31623162
# 323| 35: [ExprStmt] <Expr>;
31633163
# 323| 0: [ImplicitCoercionToUnitExpr] <implicit coercion to unit>
31643164
# 323| 0: [TypeAccess] Unit
@@ -3218,15 +3218,15 @@ exprs.kt:
32183218
# 334| 1: [StmtExpr] <Stmt>
32193219
# 334| 0: [BlockStmt] { ... }
32203220
# 334| 0: [LocalVariableDeclStmt] var ...;
3221-
# 334| 1: [LocalVariableDeclExpr] tmp6
3221+
# 334| 1: [LocalVariableDeclExpr] <unary>
32223222
# 334| 0: [VarAccess] l0
32233223
# 334| 1: [ExprStmt] <Expr>;
32243224
# 334| 0: [AssignExpr] ...=...
32253225
# 334| 0: [VarAccess] l0
32263226
# 334| 1: [MethodCall] inc(...)
3227-
# 334| -1: [VarAccess] tmp6
3227+
# 334| -1: [VarAccess] <unary>
32283228
# 334| 2: [ExprStmt] <Expr>;
3229-
# 334| 0: [VarAccess] tmp6
3229+
# 334| 0: [VarAccess] <unary>
32303230
# 335| 46: [ExprStmt] <Expr>;
32313231
# 335| 0: [ImplicitCoercionToUnitExpr] <implicit coercion to unit>
32323232
# 335| 0: [TypeAccess] Unit
@@ -3245,15 +3245,15 @@ exprs.kt:
32453245
# 336| 1: [StmtExpr] <Stmt>
32463246
# 336| 0: [BlockStmt] { ... }
32473247
# 336| 0: [LocalVariableDeclStmt] var ...;
3248-
# 336| 1: [LocalVariableDeclExpr] tmp7
3248+
# 336| 1: [LocalVariableDeclExpr] <unary>
32493249
# 336| 0: [VarAccess] l0
32503250
# 336| 1: [ExprStmt] <Expr>;
32513251
# 336| 0: [AssignExpr] ...=...
32523252
# 336| 0: [VarAccess] l0
32533253
# 336| 1: [MethodCall] dec(...)
3254-
# 336| -1: [VarAccess] tmp7
3254+
# 336| -1: [VarAccess] <unary>
32553255
# 336| 2: [ExprStmt] <Expr>;
3256-
# 336| 0: [VarAccess] tmp7
3256+
# 336| 0: [VarAccess] <unary>
32573257
# 337| 48: [ExprStmt] <Expr>;
32583258
# 337| 0: [ImplicitCoercionToUnitExpr] <implicit coercion to unit>
32593259
# 337| 0: [TypeAccess] Unit
@@ -3358,7 +3358,7 @@ exprs.kt:
33583358
# 174| 5: [Constructor] Direction
33593359
# 174| 5: [BlockStmt] { ... }
33603360
# 174| 0: [ExprStmt] <Expr>;
3361-
# 174| 0: [ClassInstanceExpr] new Enum(...)
3361+
# 174| 0: [ClassInstanceExpr] new Enum<Direction>(...)
33623362
# 174| -3: [TypeAccess] Enum<Direction>
33633363
# 174| 0: [TypeAccess] Direction
33643364
# 174| 0: [NullLiteral] null
@@ -3381,24 +3381,24 @@ exprs.kt:
33813381
# 175| 0: [ClassInstanceExpr] new Direction(...)
33823382
# 175| -3: [TypeAccess] Direction
33833383
# 178| 7: [Class] Color
3384-
# 0| 2: [Method] getEntries
3385-
# 0| 3: [TypeAccess] EnumEntries<Color>
3386-
# 0| 0: [TypeAccess] Color
3387-
# 0| 3: [Method] valueOf
3388-
# 0| 3: [TypeAccess] Color
3384+
# 178| 2: [Method] getEntries
3385+
# 178| 3: [TypeAccess] EnumEntries<Color>
3386+
# 178| 0: [TypeAccess] Color
3387+
# 178| 3: [Method] valueOf
3388+
# 178| 3: [TypeAccess] Color
33893389
#-----| 4: (Parameters)
3390-
# 0| 0: [Parameter] value
3391-
# 0| 0: [TypeAccess] String
3392-
# 0| 4: [Method] values
3393-
# 0| 3: [TypeAccess] Color[]
3394-
# 0| 0: [TypeAccess] Color
3390+
# 178| 0: [Parameter] value
3391+
# 178| 0: [TypeAccess] String
3392+
# 178| 4: [Method] values
3393+
# 178| 3: [TypeAccess] Color[]
3394+
# 178| 0: [TypeAccess] Color
33953395
# 178| 5: [Constructor] Color
33963396
#-----| 4: (Parameters)
33973397
# 178| 0: [Parameter] rgb
33983398
# 178| 0: [TypeAccess] int
33993399
# 178| 5: [BlockStmt] { ... }
34003400
# 178| 0: [ExprStmt] <Expr>;
3401-
# 178| 0: [ClassInstanceExpr] new Enum(...)
3401+
# 178| 0: [ClassInstanceExpr] new Enum<Color>(...)
34023402
# 178| -3: [TypeAccess] Enum<Color>
34033403
# 178| 0: [TypeAccess] Color
34043404
# 178| 0: [NullLiteral] null
@@ -6080,8 +6080,8 @@ samConversion.kt:
60806080
# 9| -3: [TypeAccess] Function1<Integer,Boolean>
60816081
# 9| 0: [TypeAccess] Integer
60826082
# 9| 1: [TypeAccess] Boolean
6083-
# 9| 1: [WhenBranch] ... -> ...
6084-
# 9| 0: [BooleanLiteral] true
6083+
# 11| 1: [WhenBranch] ... -> ...
6084+
# 11| 0: [BooleanLiteral] true
60856085
# 11| 1: [ExprStmt] <Expr>;
60866086
# 11| 0: [LambdaExpr] ...->...
60876087
# 11| -4: [AnonymousClass] new Function1<Integer,Boolean>(...) { ... }

0 commit comments

Comments
 (0)