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/diagnostics/tests/generics/innerClasses/bareTypes.txt
Vendored
+5 -5
View File
@@ -9,34 +9,34 @@ public final class Outer</*0*/ E> {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public final inner class Inner</*0*/ F, /*1*/ G> {
public final inner class Inner</*0*/ F, /*1*/ G> /*captured type parameters: /*2*/ E*/ {
public constructor Inner</*0*/ F, /*1*/ G>()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public final inner class Inner2 : Outer<E>.Inner<F, G>.Inner2Base {
public final inner class Inner2 /*captured type parameters: /*0*/ F, /*1*/ G, /*2*/ E*/ : Outer<E>.Inner<F, G>.Inner2Base {
public constructor Inner2()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public abstract inner class Inner2Base {
public abstract inner class Inner2Base /*captured type parameters: /*0*/ F, /*1*/ G, /*2*/ E*/ {
public constructor Inner2Base()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public final inner class Inner3</*0*/ H> : Outer<E>.Inner<F, G>.Inner3Base<H> {
public final inner class Inner3</*0*/ H> /*captured type parameters: /*1*/ F, /*2*/ G, /*3*/ E*/ : Outer<E>.Inner<F, G>.Inner3Base<H> {
public constructor Inner3</*0*/ H>()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public abstract inner class Inner3Base</*0*/ B> {
public abstract inner class Inner3Base</*0*/ B> /*captured type parameters: /*1*/ F, /*2*/ G, /*3*/ E*/ {
public constructor Inner3Base</*0*/ B>()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/tests/generics/innerClasses/checkBoundsOuter.txt
Vendored
+1 -1
View File
@@ -8,7 +8,7 @@ public final class Outer</*0*/ E : kotlin.Any> {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public final inner class Inner</*0*/ F, /*1*/ G> {
public final inner class Inner</*0*/ F, /*1*/ G> /*captured type parameters: /*2*/ E : kotlin.Any*/ {
public constructor Inner</*0*/ F, /*1*/ G>()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/tests/generics/innerClasses/innerTP.txt
Vendored
+1 -1
View File
@@ -15,7 +15,7 @@ public final class Outer</*0*/ E> {
public final fun set(/*0*/ inner: Outer<E>.Inner<out E>): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public final inner class Inner</*0*/ F> {
public final inner class Inner</*0*/ F> /*captured type parameters: /*1*/ E*/ {
public constructor Inner</*0*/ F>()
public final fun baz(): Outer<E>.Inner<kotlin.String>
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
compiler/testData/diagnostics/tests/generics/innerClasses/innerUncheckedCast.txt
Vendored
+2 -2
View File
@@ -8,7 +8,7 @@ public final class Outer</*0*/ E> {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public final inner class Inner</*0*/ H> : Outer<E>.InnerBase<H> {
public final inner class Inner</*0*/ H> /*captured type parameters: /*1*/ E*/ : Outer<E>.InnerBase<H> {
public constructor Inner</*0*/ H>()
public final val prop: E
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -16,7 +16,7 @@ public final class Outer</*0*/ E> {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public open inner class InnerBase</*0*/ F> {
public open inner class InnerBase</*0*/ F> /*captured type parameters: /*1*/ E*/ {
public constructor InnerBase</*0*/ F>()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/tests/generics/innerClasses/innerVariance.txt
Vendored
+1 -1
View File
@@ -8,7 +8,7 @@ public final class Outer</*0*/ out E, /*1*/ in F> {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public final inner class Inner {
public final inner class Inner /*captured type parameters: /*0*/ out E, /*1*/ in F*/ {
public constructor Inner()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/tests/generics/innerClasses/iterator.txt
Vendored
+1 -1
View File
@@ -22,7 +22,7 @@ public final class A</*0*/ T> : java.util.AbstractCollection<T> {
public open override /*1*/ /*fake_override*/ fun </*0*/ T : kotlin.Any!> toArray(/*0*/ p0: kotlin.Array<(out) T!>!): kotlin.Array<(out) T!>!
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public final inner class MyIt : kotlin.MutableIterator<T> {
public final inner class MyIt /*captured type parameters: /*0*/ T*/ : kotlin.MutableIterator<T> {
public constructor MyIt()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ fun hasNext(): kotlin.Boolean
compiler/testData/diagnostics/tests/generics/innerClasses/j+k.txt
Vendored
+1 -1
View File
@@ -10,7 +10,7 @@ public open class Outer</*0*/ E : kotlin.Any!> {
public/*package*/ open fun set(/*0*/ x: Outer<kotlin.String!>.Inner<E!>!): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public open inner class Inner</*0*/ F : kotlin.Any!> {
public open inner class Inner</*0*/ F : kotlin.Any!> /*captured type parameters: /*1*/ E : kotlin.Any!*/ {
public constructor Inner</*0*/ F : kotlin.Any!>()
public/*package*/ open fun bar(): F!
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
compiler/testData/diagnostics/tests/generics/innerClasses/kt408.txt
Vendored
+1 -1
View File
@@ -8,7 +8,7 @@ public open class A</*0*/ X> {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public final inner class B : T<X> {
public final inner class B /*captured type parameters: /*0*/ X*/ : T<X> {
public constructor B()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun f(): X
compiler/testData/diagnostics/tests/generics/innerClasses/kt6325.txt
Vendored
+1 -1
View File
@@ -9,7 +9,7 @@ public final class Outer</*0*/ T> {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public final inner class Inner</*0*/ R> {
public final inner class Inner</*0*/ R> /*captured type parameters: /*1*/ T*/ {
public constructor Inner</*0*/ R>()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public final fun foo(/*0*/ t: T, /*1*/ r: R): kotlin.Unit
compiler/testData/diagnostics/tests/generics/innerClasses/parameterShadowing.txt
Vendored
+1 -1
View File
@@ -9,7 +9,7 @@ public final class Outer</*0*/ E> {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public final inner class Inner</*0*/ E> {
public final inner class Inner</*0*/ E> /*captured type parameters: /*1*/ E*/ {
public constructor Inner</*0*/ E>()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public final fun foo(): E
compiler/testData/diagnostics/tests/generics/innerClasses/qualifiedOuter.txt
Vendored
+1 -1
View File
@@ -8,7 +8,7 @@ public final class Outer</*0*/ T> {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public final inner class Inner {
public final inner class Inner /*captured type parameters: /*0*/ T*/ {
public constructor Inner()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/tests/generics/innerClasses/qualifiedTypesResolution.txt
Vendored
+5 -5
View File
@@ -51,20 +51,20 @@ package test {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public final inner class Inner</*0*/ F, /*1*/ G> {
public final inner class Inner</*0*/ F, /*1*/ G> /*captured type parameters: /*2*/ E*/ {
public constructor Inner</*0*/ F, /*1*/ G>()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public final inner class Inner2 {
public final inner class Inner2 /*captured type parameters: /*0*/ F, /*1*/ G, /*2*/ E*/ {
public constructor Inner2()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public final inner class Inner3</*0*/ H> {
public final inner class Inner3</*0*/ H> /*captured type parameters: /*1*/ F, /*2*/ G, /*3*/ E*/ {
public constructor Inner3</*0*/ H>()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -78,7 +78,7 @@ package test {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public final inner class Inner4</*0*/ K> {
public final inner class Inner4</*0*/ K> /*captured type parameters: /*1*/ I*/ {
public constructor Inner4</*0*/ K>()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -98,7 +98,7 @@ package test {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public final inner class Inner5</*0*/ L> {
public final inner class Inner5</*0*/ L> /*captured type parameters: /*1*/ J*/ {
public constructor Inner5</*0*/ L>()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/tests/generics/innerClasses/simple.txt
Vendored
+1 -1
View File
@@ -13,7 +13,7 @@ public final class Outer</*0*/ E> {
public final fun set(/*0*/ inner: Outer<E>.Inner): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public final inner class Inner {
public final inner class Inner /*captured type parameters: /*0*/ E*/ {
public constructor Inner()
public final fun baz(): Outer<E>.Inner
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
compiler/testData/diagnostics/tests/generics/innerClasses/simpleIn.txt
Vendored
+1 -1
View File
@@ -13,7 +13,7 @@ public final class Outer</*0*/ in E> {
public final fun set(/*0*/ inner: Outer<E>.Inner): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public final inner class Inner {
public final inner class Inner /*captured type parameters: /*0*/ in E*/ {
public constructor Inner()
public final fun baz(): Outer<E>.Inner
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
compiler/testData/diagnostics/tests/generics/innerClasses/simpleOut.txt
Vendored
+1 -1
View File
@@ -13,7 +13,7 @@ public final class Outer</*0*/ out E> {
public final fun set(/*0*/ inner: Outer<E>.Inner): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public final inner class Inner {
public final inner class Inner /*captured type parameters: /*0*/ out E*/ {
public constructor Inner()
public final fun baz(): Outer<E>.Inner
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
compiler/testData/diagnostics/tests/generics/innerClasses/simpleOutUseSite.txt
Vendored
+1 -1
View File
@@ -13,7 +13,7 @@ public final class Outer</*0*/ E> {
public final fun set(/*0*/ inner: Outer<E>.Inner): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public final inner class Inner {
public final inner class Inner /*captured type parameters: /*0*/ E*/ {
public constructor Inner()
public final fun baz(): Outer<E>.Inner
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
compiler/testData/diagnostics/tests/generics/innerClasses/substitutedMemberScope.txt
Vendored
+1 -1
View File
@@ -12,7 +12,7 @@ public final class Outer</*0*/ E> {
public final fun setInner(/*0*/ inner: Outer<E>.Inner<kotlin.Int>): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public final inner class Inner</*0*/ F> {
public final inner class Inner</*0*/ F> /*captured type parameters: /*1*/ E*/ {
public constructor Inner</*0*/ F>()
public final fun act(): kotlin.Unit
public final fun bar(/*0*/ e: E, /*1*/ f: F): kotlin.Unit