Fix type arguments mapping

This commit is contained in:
Dmitry Petrov
2018-03-19 14:08:04 +03:00
parent eb5904ea8e
commit 135d3ab57a
33 changed files with 365 additions and 165 deletions
+1 -1
View File
@@ -82,7 +82,7 @@ FILE fqName:<root> fileName:/classes.kt
CONSTRUCTOR visibility:private <> () returnType:TestEnumClass flags:
BLOCK_BODY
ENUM_CONSTRUCTOR_CALL 'constructor Enum(String, Int)'
<E : Enum<E>>: null
<E : Enum<E>>: TestEnumClass
INSTANCE_INITIALIZER_CALL classDescriptor='TestEnumClass'
FUN FAKE_OVERRIDE name:clone visibility:protected modality:FINAL <> ($this:kotlin.Enum<TestEnumClass>) returnType:Any flags:
overridden:
@@ -493,7 +493,7 @@ FILE fqName:<root> fileName:/dataClassWithArrayMembers.kt
BLOCK_BODY
RETURN type=kotlin.Nothing from='copy(Array<T> = ...): Test2<T>'
CALL 'constructor Test2(Array<T>)' type=Test2<T> origin=null
<T>: null
<T>: T
genericArray: GET_VAR 'value-parameter genericArray: Array<T> = ...' type=kotlin.Array<T> origin=null
FUN GENERATED_DATA_CLASS_MEMBER name:toString visibility:public modality:OPEN <> ($this:Test2<T>) returnType:String flags:
overridden:
+1 -1
View File
@@ -36,7 +36,7 @@ FILE fqName:<root> fileName:/dataClassesGeneric.kt
BLOCK_BODY
RETURN type=kotlin.Nothing from='copy(T = ...): Test1<T>'
CALL 'constructor Test1(T)' type=Test1<T> origin=null
<T>: null
<T>: T
x: GET_VAR 'value-parameter x: T = ...' type=T origin=null
FUN GENERATED_DATA_CLASS_MEMBER name:toString visibility:public modality:OPEN <> ($this:Test1<T>) returnType:String flags:
overridden:
@@ -43,7 +43,7 @@ FILE fqName:<root> fileName:/delegatingConstructorCallToTypeAliasConstructor.kt
CONSTRUCTOR visibility:public <> () returnType:C1 flags:
BLOCK_BODY
DELEGATING_CONSTRUCTOR_CALL 'constructor Cell(String)'
<T>: null
<T>: String
value: CONST String type=kotlin.String value=O
INSTANCE_INITIALIZER_CALL classDescriptor='C1'
PROPERTY FAKE_OVERRIDE name:value type:kotlin.String visibility:public modality:FINAL flags:val
@@ -71,7 +71,7 @@ FILE fqName:<root> fileName:/delegatingConstructorCallToTypeAliasConstructor.kt
CONSTRUCTOR visibility:public <> () returnType:C2 flags:
BLOCK_BODY
DELEGATING_CONSTRUCTOR_CALL 'constructor Cell(String)'
<T>: null
<T>: String
value: CONST String type=kotlin.String value=K
INSTANCE_INITIALIZER_CALL classDescriptor='C2'
PROPERTY FAKE_OVERRIDE name:value type:kotlin.String visibility:public modality:FINAL flags:val
+5 -5
View File
@@ -6,7 +6,7 @@ FILE fqName:<root> fileName:/enum.kt
CONSTRUCTOR visibility:private <> () returnType:TestEnum1 flags:
BLOCK_BODY
ENUM_CONSTRUCTOR_CALL 'constructor Enum(String, Int)'
<E : Enum<E>>: null
<E : Enum<E>>: TestEnum1
INSTANCE_INITIALIZER_CALL classDescriptor='TestEnum1'
ENUM_ENTRY name:TEST1
init: ENUM_CONSTRUCTOR_CALL 'constructor TestEnum1()'
@@ -65,7 +65,7 @@ FILE fqName:<root> fileName:/enum.kt
VALUE_PARAMETER name:x index:0 type:kotlin.Int flags:
BLOCK_BODY
ENUM_CONSTRUCTOR_CALL 'constructor Enum(String, Int)'
<E : Enum<E>>: null
<E : Enum<E>>: TestEnum2
INSTANCE_INITIALIZER_CALL classDescriptor='TestEnum2'
PROPERTY name:x type:kotlin.Int visibility:public modality:FINAL flags:val
FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public
@@ -138,7 +138,7 @@ FILE fqName:<root> fileName:/enum.kt
CONSTRUCTOR visibility:private <> () returnType:TestEnum3 flags:
BLOCK_BODY
ENUM_CONSTRUCTOR_CALL 'constructor Enum(String, Int)'
<E : Enum<E>>: null
<E : Enum<E>>: TestEnum3
INSTANCE_INITIALIZER_CALL classDescriptor='TestEnum3'
ENUM_ENTRY name:TEST
init: ENUM_CONSTRUCTOR_CALL 'constructor TEST()'
@@ -252,7 +252,7 @@ FILE fqName:<root> fileName:/enum.kt
VALUE_PARAMETER name:x index:0 type:kotlin.Int flags:
BLOCK_BODY
ENUM_CONSTRUCTOR_CALL 'constructor Enum(String, Int)'
<E : Enum<E>>: null
<E : Enum<E>>: TestEnum4
INSTANCE_INITIALIZER_CALL classDescriptor='TestEnum4'
PROPERTY name:x type:kotlin.Int visibility:public modality:FINAL flags:val
FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public
@@ -461,7 +461,7 @@ FILE fqName:<root> fileName:/enum.kt
CONST Int type=kotlin.Int value=0
BLOCK_BODY
ENUM_CONSTRUCTOR_CALL 'constructor Enum(String, Int)'
<E : Enum<E>>: null
<E : Enum<E>>: TestEnum5
INSTANCE_INITIALIZER_CALL classDescriptor='TestEnum5'
PROPERTY name:x type:kotlin.Int visibility:public modality:FINAL flags:val
FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public
@@ -7,7 +7,7 @@ FILE fqName:<root> fileName:/enumWithSecondaryCtor.kt
VALUE_PARAMETER name:x index:0 type:kotlin.Int flags:
BLOCK_BODY
ENUM_CONSTRUCTOR_CALL 'constructor Enum(String, Int)'
<E : Enum<E>>: null
<E : Enum<E>>: Test0
INSTANCE_INITIALIZER_CALL classDescriptor='Test0'
PROPERTY name:x type:kotlin.Int visibility:public modality:FINAL flags:val
FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public
@@ -78,7 +78,7 @@ FILE fqName:<root> fileName:/enumWithSecondaryCtor.kt
VALUE_PARAMETER name:x index:0 type:kotlin.Int flags:
BLOCK_BODY
ENUM_CONSTRUCTOR_CALL 'constructor Enum(String, Int)'
<E : Enum<E>>: null
<E : Enum<E>>: Test1
INSTANCE_INITIALIZER_CALL classDescriptor='Test1'
PROPERTY name:x type:kotlin.Int visibility:public modality:FINAL flags:val
FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public
@@ -152,7 +152,7 @@ FILE fqName:<root> fileName:/enumWithSecondaryCtor.kt
VALUE_PARAMETER name:x index:0 type:kotlin.Int flags:
BLOCK_BODY
ENUM_CONSTRUCTOR_CALL 'constructor Enum(String, Int)'
<E : Enum<E>>: null
<E : Enum<E>>: Test2
INSTANCE_INITIALIZER_CALL classDescriptor='Test2'
PROPERTY name:x type:kotlin.Int visibility:public modality:FINAL flags:val
FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public