azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Render captured type parameters in verbose mode

Browse Source
This commit is contained in:
Denis Zharkov
2015-11-11 19:52:22 +03:00
parent 6ae653e5a1
commit e920ce709b
42 changed files with 84 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/loadJava/compiledJava/InnerClassReferencesOuterTP.txt
Vendored
+1 -1
View File
@@ -3,7 +3,7 @@ package test
public open class InnerClassReferencesOuterTP</*0*/ P : kotlin.Any!> {
public constructor InnerClassReferencesOuterTP</*0*/ P : kotlin.Any!>()
public open inner class Inner</*0*/ Q : P!> {
public open inner class Inner</*0*/ Q : P!> /*captured type parameters: /*1*/ P : kotlin.Any!*/ {
public constructor Inner</*0*/ Q : P!>()
}
}
compiler/testData/loadJava/compiledJava/InnerClassesInGeneric.runtime.txt
Vendored
+2 -2
View File
@@ -3,11 +3,11 @@ package test
public open class InnerClassesInGeneric</*0*/ P : kotlin.Any!, /*1*/ Q : kotlin.Any!> {
public constructor InnerClassesInGeneric</*0*/ P : kotlin.Any!, /*1*/ Q : kotlin.Any!>()
public open inner class Inner {
public open inner class Inner /*captured type parameters: /*0*/ P : kotlin.Any!, /*1*/ Q : kotlin.Any!*/ {
public constructor Inner()
}
public open inner class Inner2 : test.InnerClassesInGeneric<kotlin.Any!, kotlin.Any!>.Inner {
public open inner class Inner2 /*captured type parameters: /*0*/ P : kotlin.Any!, /*1*/ Q : kotlin.Any!*/ : test.InnerClassesInGeneric<kotlin.Any!, kotlin.Any!>.Inner {
public constructor Inner2()
public open operator fun iterator(): kotlin.(Mutable)Iterator<P!>!
}
compiler/testData/loadJava/compiledJava/InnerClassesInGeneric.txt
Vendored
+2 -2
View File
@@ -3,11 +3,11 @@ package test
public open class InnerClassesInGeneric</*0*/ P : kotlin.Any!, /*1*/ Q : kotlin.Any!> {
public constructor InnerClassesInGeneric</*0*/ P : kotlin.Any!, /*1*/ Q : kotlin.Any!>()
public open inner class Inner {
public open inner class Inner /*captured type parameters: /*0*/ P : kotlin.Any!, /*1*/ Q : kotlin.Any!*/ {
public constructor Inner()
}
public open inner class Inner2 : test.InnerClassesInGeneric<P!, Q!>.Inner {
public open inner class Inner2 /*captured type parameters: /*0*/ P : kotlin.Any!, /*1*/ Q : kotlin.Any!*/ : test.InnerClassesInGeneric<P!, Q!>.Inner {
public constructor Inner2()
public open operator fun iterator(): kotlin.(Mutable)Iterator<P!>!
}
compiler/testData/loadJava/compiledJava/InnerOfGeneric.runtime.txt
Vendored
+2 -2
View File
@@ -6,7 +6,7 @@ public open class InnerOfGeneric {
public abstract inner class A</*0*/ K : kotlin.Any!> {
public constructor A</*0*/ K : kotlin.Any!>()
public abstract inner class Inner : test.InnerOfGeneric.S<K!> {
public abstract inner class Inner /*captured type parameters: /*0*/ K : kotlin.Any!*/ : test.InnerOfGeneric.S<K!> {
public constructor Inner()
public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.(Mutable)Iterator<K!>!
}
@@ -15,7 +15,7 @@ public open class InnerOfGeneric {
public open inner class B</*0*/ L : kotlin.Any!> : test.InnerOfGeneric.A<L!> {
public constructor B</*0*/ L : kotlin.Any!>()
public open inner class SubInner : test.InnerOfGeneric.A<kotlin.Any!>.Inner {
public open inner class SubInner /*captured type parameters: /*0*/ L : kotlin.Any!*/ : test.InnerOfGeneric.A<kotlin.Any!>.Inner {
public constructor SubInner()
public open override /*1*/ fun iterator(): kotlin.(Mutable)Iterator<L!>!
}
compiler/testData/loadJava/compiledJava/InnerOfGeneric.txt
Vendored
+2 -2
View File
@@ -6,7 +6,7 @@ public open class InnerOfGeneric {
public abstract inner class A</*0*/ K : kotlin.Any!> {
public constructor A</*0*/ K : kotlin.Any!>()
public abstract inner class Inner : test.InnerOfGeneric.S<K!> {
public abstract inner class Inner /*captured type parameters: /*0*/ K : kotlin.Any!*/ : test.InnerOfGeneric.S<K!> {
public constructor Inner()
public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.(Mutable)Iterator<K!>!
}
@@ -15,7 +15,7 @@ public open class InnerOfGeneric {
public open inner class B</*0*/ L : kotlin.Any!> : test.InnerOfGeneric.A<L!> {
public constructor B</*0*/ L : kotlin.Any!>()
public open inner class SubInner : test.InnerOfGeneric.A<L!>.Inner {
public open inner class SubInner /*captured type parameters: /*0*/ L : kotlin.Any!*/ : test.InnerOfGeneric.A<L!>.Inner {
public constructor SubInner()
public open override /*1*/ fun iterator(): kotlin.(Mutable)Iterator<L!>!
}
compiler/testData/loadJava/compiledJava/MethodReferencesOuterClassTP.txt
Vendored
+1 -1
View File
@@ -3,7 +3,7 @@ package test
public final class MethodReferencesOuterClassTP</*0*/ P : kotlin.Any!> {
public constructor MethodReferencesOuterClassTP</*0*/ P : kotlin.Any!>()
public final inner class Inner {
public final inner class Inner /*captured type parameters: /*0*/ P : kotlin.Any!*/ {
public constructor Inner()
public final fun </*0*/ Q : P!> f(): kotlin.Unit
}
compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfOuterClass.txt
Vendored
+1 -1
View File
@@ -3,7 +3,7 @@ package test
public open class TypeParameterOfOuterClass</*0*/ T : kotlin.Any!> {
public constructor TypeParameterOfOuterClass</*0*/ T : kotlin.Any!>()
public open inner class Inner {
public open inner class Inner /*captured type parameters: /*0*/ T : kotlin.Any!*/ {
public constructor Inner()
public open fun foo(/*0*/ p0: java.util.Comparator<T!>!): kotlin.Unit
}
compiler/testData/loadJava/compiledJava/signaturePropagation/ReturnInnerSubclassOfSupersInner.runtime.txt
Vendored
+2 -2
View File
@@ -5,7 +5,7 @@ public interface ReturnInnerSubclassOfSupersInner {
public open class Sub</*0*/ B : kotlin.Any!> : test.ReturnInnerSubclassOfSupersInner.Super<B!> {
public constructor Sub</*0*/ B : kotlin.Any!>()
public/*package*/ open inner class Inner : test.ReturnInnerSubclassOfSupersInner.Super<kotlin.Any!>.Inner {
public/*package*/ open inner class Inner /*captured type parameters: /*0*/ B : kotlin.Any!*/ : test.ReturnInnerSubclassOfSupersInner.Super<kotlin.Any!>.Inner {
public/*package*/ constructor Inner()
public/*package*/ open override /*1*/ fun get(): test.ReturnInnerSubclassOfSupersInner.Sub<B!>!
}
@@ -14,7 +14,7 @@ public interface ReturnInnerSubclassOfSupersInner {
public open class Super</*0*/ A : kotlin.Any!> {
public constructor Super</*0*/ A : kotlin.Any!>()
public/*package*/ open inner class Inner {
public/*package*/ open inner class Inner /*captured type parameters: /*0*/ A : kotlin.Any!*/ {
public/*package*/ constructor Inner()
public/*package*/ open fun get(): test.ReturnInnerSubclassOfSupersInner.Super<A!>!
}
compiler/testData/loadJava/compiledJava/signaturePropagation/ReturnInnerSubclassOfSupersInner.txt
Vendored
+2 -2
View File
@@ -5,7 +5,7 @@ public interface ReturnInnerSubclassOfSupersInner {
public open class Sub</*0*/ B : kotlin.Any!> : test.ReturnInnerSubclassOfSupersInner.Super<B!> {
public constructor Sub</*0*/ B : kotlin.Any!>()
public/*package*/ open inner class Inner : test.ReturnInnerSubclassOfSupersInner.Super<B!>.Inner {
public/*package*/ open inner class Inner /*captured type parameters: /*0*/ B : kotlin.Any!*/ : test.ReturnInnerSubclassOfSupersInner.Super<B!>.Inner {
public/*package*/ constructor Inner()
public/*package*/ open override /*1*/ fun get(): test.ReturnInnerSubclassOfSupersInner.Sub<B!>!
}
@@ -14,7 +14,7 @@ public interface ReturnInnerSubclassOfSupersInner {
public open class Super</*0*/ A : kotlin.Any!> {
public constructor Super</*0*/ A : kotlin.Any!>()
public/*package*/ open inner class Inner {
public/*package*/ open inner class Inner /*captured type parameters: /*0*/ A : kotlin.Any!*/ {
public/*package*/ constructor Inner()
public/*package*/ open fun get(): test.ReturnInnerSubclassOfSupersInner.Super<A!>!
}
compiler/testData/loadJava/compiledKotlin/class/InnerTypes.txt
Vendored
+3 -3
View File
@@ -4,16 +4,16 @@ public final class Outer</*0*/ E, /*1*/ F> {
/*primary*/ public constructor Outer</*0*/ E, /*1*/ F>()
public final fun bar(/*0*/ x: test.Outer<kotlin.String, kotlin.Double>.Inner2, /*1*/ y: test.Outer<E, F>.Inner2): kotlin.Unit
public final inner class Inner</*0*/ G, /*1*/ H> {
public final inner class Inner</*0*/ G, /*1*/ H> /*captured type parameters: /*2*/ E, /*3*/ F*/ {
/*primary*/ public constructor Inner</*0*/ G, /*1*/ H>()
public final inner class Inner3</*0*/ I> {
public final inner class Inner3</*0*/ I> /*captured type parameters: /*1*/ G, /*2*/ H, /*3*/ E, /*4*/ F*/ {
/*primary*/ public constructor Inner3</*0*/ I>()
public final fun foo(/*0*/ x: test.Outer<kotlin.String, F>.Inner<G, kotlin.Int>, /*1*/ y: test.Outer<E, F>.Inner<E, kotlin.Double>, /*2*/ z: test.Outer<kotlin.String, F>.Inner<G, kotlin.Int>.Inner3<kotlin.Double>, /*3*/ w: test.Outer<E, F>.Inner<G, H>.Inner3<*>): kotlin.Unit
}
}
public final inner class Inner2 {
public final inner class Inner2 /*captured type parameters: /*0*/ E, /*1*/ F*/ {
/*primary*/ public constructor Inner2()
}
}
compiler/testData/loadJava/compiledKotlin/nested/deepInnerGeneric.txt
Vendored
+3 -3
View File
@@ -3,13 +3,13 @@ package test
public final class A</*0*/ TA> {
/*primary*/ public constructor A</*0*/ TA>()
public final inner class B</*0*/ TB> {
public final inner class B</*0*/ TB> /*captured type parameters: /*1*/ TA*/ {
/*primary*/ public constructor B</*0*/ TB>()
public final inner class C</*0*/ TC> {
public final inner class C</*0*/ TC> /*captured type parameters: /*1*/ TB, /*2*/ TA*/ {
/*primary*/ public constructor C</*0*/ TC>()
public final inner class D</*0*/ TD> {
public final inner class D</*0*/ TD> /*captured type parameters: /*1*/ TC, /*2*/ TB, /*3*/ TA*/ {
/*primary*/ public constructor D</*0*/ TD>()
public final fun bar(/*0*/ ta: TA, /*1*/ tb: TB, /*2*/ tc: TC, /*3*/ td: TD): test.A<TA>.B<TB>.C<TC>.D<TD>
public final fun </*0*/ P1, /*1*/ P2, /*2*/ P3, /*3*/ P4> foo(/*0*/ p1: P1, /*1*/ p2: P2, /*2*/ p3: P3, /*3*/ p4: P4): kotlin.Nothing
compiler/testData/loadJava/compiledKotlin/nested/innerClassReferencesOuterTP.txt
Vendored
+1 -1
View File
@@ -3,7 +3,7 @@ package test
public final class InnerClassReferencesOuterTP</*0*/ P> {
/*primary*/ public constructor InnerClassReferencesOuterTP</*0*/ P>()
public final inner class Inner</*0*/ Q : P> {
public final inner class Inner</*0*/ Q : P> /*captured type parameters: /*1*/ P*/ {
/*primary*/ public constructor Inner</*0*/ Q : P>()
}
}
compiler/testData/loadJava/compiledKotlin/nested/membersReferenceOuterTP.txt
Vendored
+1 -1
View File
@@ -3,7 +3,7 @@ package test
public final class MembersReferenceOuterTP</*0*/ P> {
/*primary*/ public constructor MembersReferenceOuterTP</*0*/ P>()
public final inner class Inner {
public final inner class Inner /*captured type parameters: /*0*/ P*/ {
/*primary*/ public constructor Inner()
public final val v: P
public final fun <get-v>(): P
compiler/testData/loadJava/sourceJava/ReturnInnerSubclassOfSupersInner.txt
Vendored
+2 -2
View File
@@ -5,7 +5,7 @@ public interface ReturnInnerSubclassOfSupersInner {
public open class Sub</*0*/ B : kotlin.Any!> : test.ReturnInnerSubclassOfSupersInner.Super<B!> {
public constructor Sub</*0*/ B : kotlin.Any!>()
public/*package*/ open inner class Inner : test.ReturnInnerSubclassOfSupersInner.Super<B!>.Inner {
public/*package*/ open inner class Inner /*captured type parameters: /*0*/ B : kotlin.Any!*/ : test.ReturnInnerSubclassOfSupersInner.Super<B!>.Inner {
public/*package*/ constructor Inner()
public/*package*/ open override /*1*/ fun get(): test.ReturnInnerSubclassOfSupersInner.Sub<B!>!
}
@@ -14,7 +14,7 @@ public interface ReturnInnerSubclassOfSupersInner {
public open class Super</*0*/ A : kotlin.Any!> {
public constructor Super</*0*/ A : kotlin.Any!>()
public/*package*/ open inner class Inner {
public/*package*/ open inner class Inner /*captured type parameters: /*0*/ A : kotlin.Any!*/ {
public/*package*/ constructor Inner()
public/*package*/ open fun get(): test.ReturnInnerSubclassOfSupersInner.Super<A!>!
}