Update expected files after rebase

This commit is contained in:
Tamas Vajk
2022-01-13 11:30:25 +01:00
committed by Ian Lynagh
parent 9e21fa838e
commit 8e31bd8ec7
2 changed files with 16 additions and 19 deletions

View File

@@ -164,13 +164,13 @@ generics.kt:
# 44| 5: [BlockStmt] { ... }
# 45| 0: [LocalVariableDeclStmt] var ...;
# 45| 1: [LocalVariableDeclExpr] c
# 45| 0: [ClassInstanceExpr] new Inner1<Integer,String,T1,T2>(...)
# 45| -3: [TypeAccess] Inner1<Integer,String,T1,T2>
# 45| 0: [ClassInstanceExpr] new Inner1<Integer,String>(...)
# 45| -3: [TypeAccess] Inner1<Integer,String>
# 45| 0: [TypeAccess] Integer
# 45| 1: [TypeAccess] String
# 45| -2: [ThisAccess] Outer.this
# 45| 0: [TypeAccess] Outer
# 49| 4: [Class,GenericType,ParameterizedType] Nested1
# 49| 5: [Class,GenericType,ParameterizedType] Nested1
#-----| -2: (Generic Parameters)
# 49| 0: [TypeVariable] T3
# 49| 1: [TypeVariable] T4
@@ -190,7 +190,7 @@ generics.kt:
# 51| -3: [TypeAccess] Nested1<Integer,String>
# 51| 0: [TypeAccess] Integer
# 51| 1: [TypeAccess] String
# 56| 21: [Class,GenericType,ParameterizedType] Class1
# 56| 19: [Class,GenericType,ParameterizedType] Class1
#-----| -2: (Generic Parameters)
# 56| 0: [TypeVariable] T1
# 56| 1: [Constructor] Class1
@@ -223,8 +223,8 @@ generics.kt:
# 61| 1: [ExprStmt] <Expr>;
# 61| 0: [MethodAccess] fn2(...)
# 61| -2: [TypeAccess] String
# 61| -1: [ClassInstanceExpr] new Local<Integer,T2,T1>(...)
# 61| -3: [TypeAccess] Local<Integer,T2,T1>
# 61| -1: [ClassInstanceExpr] new Local<Integer>(...)
# 61| -3: [TypeAccess] Local<Integer>
# 61| 0: [TypeAccess] Integer
# 61| 0: [VarAccess] t
# 61| 1: [StringLiteral]

View File

@@ -40,19 +40,16 @@ parameterizedType
| generics.kt:42:1:54:1 | Outer<T1,T2> | generics.kt:42:1:54:1 | Outer | 1 | T2 |
| generics.kt:43:5:47:5 | Inner1 | generics.kt:43:5:47:5 | Inner1 | 0 | T3 |
| generics.kt:43:5:47:5 | Inner1 | generics.kt:43:5:47:5 | Inner1 | 1 | T4 |
| generics.kt:43:5:47:5 | Inner1<Integer,String,T1,T2> | generics.kt:43:5:47:5 | Inner1 | 0 | Integer |
| generics.kt:43:5:47:5 | Inner1<Integer,String,T1,T2> | generics.kt:43:5:47:5 | Inner1 | 1 | String |
| generics.kt:43:5:47:5 | Inner1<Integer,String,T1,T2> | generics.kt:43:5:47:5 | Inner1 | 2 | T1 |
| generics.kt:43:5:47:5 | Inner1<Integer,String,T1,T2> | generics.kt:43:5:47:5 | Inner1 | 3 | T2 |
| generics.kt:43:5:47:5 | Inner1<Integer,String> | generics.kt:43:5:47:5 | Inner1 | 0 | Integer |
| generics.kt:43:5:47:5 | Inner1<Integer,String> | generics.kt:43:5:47:5 | Inner1 | 1 | String |
| generics.kt:49:5:53:5 | Nested1 | generics.kt:49:5:53:5 | Nested1 | 0 | T3 |
| generics.kt:49:5:53:5 | Nested1 | generics.kt:49:5:53:5 | Nested1 | 1 | T4 |
| generics.kt:49:5:53:5 | Nested1<Integer,String> | generics.kt:49:5:53:5 | Nested1 | 0 | Integer |
| generics.kt:49:5:53:5 | Nested1<Integer,String> | generics.kt:49:5:53:5 | Nested1 | 1 | String |
| generics.kt:56:1:63:1 | Class1 | generics.kt:56:1:63:1 | Class1 | 0 | T1 |
| generics.kt:56:1:63:1 | Class1<T2> | generics.kt:56:1:63:1 | Class1 | 0 | T2 |
| generics.kt:58:9:60:9 | Local | generics.kt:58:9:60:9 | Local | 0 | T3 |
| generics.kt:58:9:60:9 | Local<Integer,T2,T1> | generics.kt:58:9:60:9 | Local | 0 | Integer |
| generics.kt:58:9:60:9 | Local<Integer,T2,T1> | generics.kt:58:9:60:9 | Local | 1 | T2 |
| generics.kt:58:9:60:9 | Local<Integer,T2,T1> | generics.kt:58:9:60:9 | Local | 2 | T1 |
| generics.kt:58:9:60:9 | Local<Integer> | generics.kt:58:9:60:9 | Local | 0 | Integer |
function
| generics.kt:3:1:5:1 | f0 | f0(int,java.lang.Object) |
| generics.kt:7:1:9:1 | f1 | f1(int,java.lang.Object) |
@@ -87,7 +84,7 @@ function
| generics.kt:42:1:54:1 | Outer | Outer() |
| generics.kt:43:5:47:5 | <obinit> | <obinit>() |
| generics.kt:43:11:47:5 | Inner1 | Inner1() |
| generics.kt:43:11:47:5 | Inner1<Integer,String,T1,T2> | Inner1<Integer,String,T1,T2>() |
| generics.kt:43:11:47:5 | Inner1<Integer,String> | Inner1<Integer,String>() |
| generics.kt:44:9:46:9 | fn1 | fn1(java.lang.Object,java.lang.Object,int,java.lang.String) |
| generics.kt:44:9:46:9 | fn1 | fn1(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object) |
| generics.kt:49:5:53:5 | <obinit> | <obinit>() |
@@ -100,7 +97,7 @@ function
| generics.kt:57:5:62:5 | fn1 | fn1(java.lang.Object) |
| generics.kt:58:9:60:9 | <obinit> | <obinit>() |
| generics.kt:58:9:60:9 | Local | Local() |
| generics.kt:58:9:60:9 | Local<Integer,T2,T1> | Local<Integer,T2,T1>() |
| generics.kt:58:9:60:9 | Local<Integer> | Local<Integer>() |
| generics.kt:59:13:59:43 | fn2 | fn2(java.lang.Object,java.lang.Object) |
| generics.kt:59:13:59:43 | fn2 | fn2(java.lang.Object,java.lang.Object) |
genericFunction
@@ -113,7 +110,7 @@ genericFunction
| generics.kt:21:5:21:23 | f4 | generics.kt:20:1:22:1 | C2 | generics.kt:21:10:21:10 | P | 0 |
| generics.kt:57:5:62:5 | fn1 | generics.kt:56:1:63:1 | Class1 | generics.kt:57:10:57:11 | T2 | 0 |
| generics.kt:59:13:59:43 | fn2 | generics.kt:58:9:60:9 | Local | generics.kt:59:18:59:19 | T4 | 0 |
| generics.kt:59:13:59:43 | fn2 | generics.kt:58:9:60:9 | Local<Integer,T2,T1> | generics.kt:59:18:59:19 | T4 | 0 |
| generics.kt:59:13:59:43 | fn2 | generics.kt:58:9:60:9 | Local<Integer> | generics.kt:59:18:59:19 | T4 | 0 |
genericCall
| generics.kt:27:17:27:22 | f2(...) | generics.kt:15:10:15:10 | U | String |
| generics.kt:30:17:30:21 | f2(...) | generics.kt:15:10:15:10 | U | Integer |
@@ -127,8 +124,8 @@ genericCtor
| generics.kt:28:14:28:32 | new C1<String,Integer>(...) | 0 | String |
| generics.kt:28:14:28:32 | new C1<String,Integer>(...) | 1 | Integer |
| generics.kt:33:21:33:29 | new C0<Integer>(...) | 0 | Integer |
| generics.kt:45:21:45:41 | new Inner1<Integer,String,T1,T2>(...) | 0 | Integer |
| generics.kt:45:21:45:41 | new Inner1<Integer,String,T1,T2>(...) | 1 | String |
| generics.kt:45:21:45:41 | new Inner1<Integer,String>(...) | 0 | Integer |
| generics.kt:45:21:45:41 | new Inner1<Integer,String>(...) | 1 | String |
| generics.kt:51:21:51:42 | new Nested1<Integer,String>(...) | 0 | Integer |
| generics.kt:51:21:51:42 | new Nested1<Integer,String>(...) | 1 | String |
| generics.kt:61:9:61:20 | new Local<Integer,T2,T1>(...) | 0 | Integer |
| generics.kt:61:9:61:20 | new Local<Integer>(...) | 0 | Integer |