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

replace 'trait' keyword with 'interface' in user-visible messages and code generation tools

Browse Source
This commit is contained in:
Dmitry Jemerov
2015-05-11 19:37:38 +02:00
parent 25959fefdc
commit 9975bb8935
704 changed files with 1684 additions and 1727 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/multimodule/duplicateClass/duplicateSuperClass.txt
+4 -4
View File
@@ -3,7 +3,7 @@ package
package p {
public trait A {
public interface A {
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
@@ -32,7 +32,7 @@ package
package p {
public fun foo(/*0*/ a: p.A): kotlin.Unit
public trait A {
public interface A {
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
@@ -48,11 +48,11 @@ internal fun test(): kotlin.Unit
package p {
public fun foo(/*0*/ a: p.A): kotlin.Unit
public trait A {
public interface A {
// -- Module: <m1> --
}
public trait A {
public interface A {
// -- Module: <m2> --
}
compiler/testData/diagnostics/tests/multimodule/duplicateClass/genericSuperClass.txt
+12 -12
View File
@@ -3,7 +3,7 @@ package
package p {
public trait A</*0*/ T> {
public interface A</*0*/ T> {
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
@@ -16,13 +16,13 @@ package p {
public open override /*3*/ /*fake_override*/ fun toString(): kotlin.String
}
public trait C {
public interface C {
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 trait D</*0*/ T> {
public interface D</*0*/ T> {
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
@@ -46,19 +46,19 @@ package p {
public fun c(/*0*/ c: p.C<kotlin.Int>): kotlin.Unit
public fun d(/*0*/ d: p.D<kotlin.Int>): kotlin.Unit
public trait A {
public interface A {
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 trait C</*0*/ T> {
public interface C</*0*/ T> {
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 trait D</*0*/ T> {
public interface D</*0*/ T> {
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
@@ -76,11 +76,11 @@ package p {
public fun c(/*0*/ c: p.C<kotlin.Int>): kotlin.Unit
public fun d(/*0*/ d: p.D<kotlin.Int>): kotlin.Unit
public trait A {
public interface A {
// -- Module: <m2> --
}
public trait A</*0*/ T> {
public interface A</*0*/ T> {
// -- Module: <m1> --
}
@@ -88,19 +88,19 @@ package p {
// -- Module: <m1> --
}
public trait C {
public interface C {
// -- Module: <m1> --
}
public trait C</*0*/ T> {
public interface C</*0*/ T> {
// -- Module: <m2> --
}
public trait D</*0*/ T> {
public interface D</*0*/ T> {
// -- Module: <m1> --
}
public trait D</*0*/ T> {
public interface D</*0*/ T> {
// -- Module: <m2> --
}
compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParams.txt
+6 -6
View File
@@ -3,7 +3,7 @@ package
package p {
public trait B</*0*/ T> {
public interface B</*0*/ T> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract fun foo(/*0*/ a: T): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -17,11 +17,11 @@ package
package p {
public trait B</*0*/ T> {
public interface B</*0*/ T> {
// -- Module: <m1> --
}
public trait C</*0*/ X> : p.B<X> {
public interface C</*0*/ X> : p.B<X> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract override /*1*/ fun foo(/*0*/ a: X): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -35,7 +35,7 @@ package
package p {
public trait B</*0*/ T> {
public interface B</*0*/ T> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract fun foo(/*0*/ a: T): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -51,11 +51,11 @@ internal fun test(/*0*/ b: p.B<kotlin.String>?): kotlin.Unit
package p {
public trait B</*0*/ T> {
public interface B</*0*/ T> {
// -- Module: <m3> --
}
public trait C</*0*/ X> : p.B<X> {
public interface C</*0*/ X> : p.B<X> {
// -- Module: <m2> --
}
}
compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParamsBoundMismatch.txt
+8 -8
View File
@@ -3,7 +3,7 @@ package
package p {
public trait B</*0*/ T> {
public interface B</*0*/ T> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract fun foo(/*0*/ a: T?): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -17,11 +17,11 @@ package
package p {
public trait B</*0*/ T> {
public interface B</*0*/ T> {
// -- Module: <m1> --
}
public trait C</*0*/ X> : p.B<X> {
public interface C</*0*/ X> : p.B<X> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract override /*1*/ fun foo(/*0*/ a: X?): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -35,14 +35,14 @@ package
package p {
public trait B</*0*/ T : p.Tr?> {
public interface B</*0*/ T : p.Tr?> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract fun foo(/*0*/ a: T?): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public trait Tr {
public interface Tr {
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
@@ -57,15 +57,15 @@ internal fun test(/*0*/ b: p.B<p.Tr>?): kotlin.Unit
package p {
public trait B</*0*/ T : p.Tr?> {
public interface B</*0*/ T : p.Tr?> {
// -- Module: <m3> --
}
public trait C</*0*/ X> : p.B<X> {
public interface C</*0*/ X> : p.B<X> {
// -- Module: <m2> --
}
public trait Tr {
public interface Tr {
// -- Module: <m3> --
}
}
compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParamsIndexMismatch.txt
+6 -6
View File
@@ -3,7 +3,7 @@ package
package p {
public trait B</*0*/ T, /*1*/ _> {
public interface B</*0*/ T, /*1*/ _> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract fun foo(/*0*/ a: T?): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -17,11 +17,11 @@ package
package p {
public trait B</*0*/ T, /*1*/ _> {
public interface B</*0*/ T, /*1*/ _> {
// -- Module: <m1> --
}
public trait C</*0*/ X, /*1*/ _> : p.B<X, _> {
public interface C</*0*/ X, /*1*/ _> : p.B<X, _> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract override /*1*/ fun foo(/*0*/ a: X?): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -35,7 +35,7 @@ package
package p {
public trait B</*0*/ _, /*1*/ T> {
public interface B</*0*/ _, /*1*/ T> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract fun foo(/*0*/ a: T?): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -51,11 +51,11 @@ internal fun </*0*/ Y, /*1*/ Z> test(/*0*/ b: p.B<Y, Z>?): kotlin.Unit
package p {
public trait B</*0*/ _, /*1*/ T> {
public interface B</*0*/ _, /*1*/ T> {
// -- Module: <m3> --
}
public trait C</*0*/ X, /*1*/ _> : p.B<X, _> {
public interface C</*0*/ X, /*1*/ _> : p.B<X, _> {
// -- Module: <m2> --
}
}
compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParamsNameMismatch.txt
+6 -6
View File
@@ -3,7 +3,7 @@ package
package p {
public trait B</*0*/ T> {
public interface B</*0*/ T> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract fun foo(/*0*/ a: T): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -17,11 +17,11 @@ package
package p {
public trait B</*0*/ T> {
public interface B</*0*/ T> {
// -- Module: <m1> --
}
public trait C</*0*/ X> : p.B<X> {
public interface C</*0*/ X> : p.B<X> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract override /*1*/ fun foo(/*0*/ a: X): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -35,7 +35,7 @@ package
package p {
public trait B</*0*/ T1> {
public interface B</*0*/ T1> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract fun foo(/*0*/ a: T1): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -51,11 +51,11 @@ internal fun </*0*/ Y> test(/*0*/ b: p.B<Y>?, /*1*/ y: Y): kotlin.Unit
package p {
public trait B</*0*/ T1> {
public interface B</*0*/ T1> {
// -- Module: <m3> --
}
public trait C</*0*/ X> : p.B<X> {
public interface C</*0*/ X> : p.B<X> {
// -- Module: <m2> --
}
}
compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInReturnType.txt
+6 -6
View File
@@ -3,7 +3,7 @@ package
package p {
public trait B</*0*/ T> {
public interface B</*0*/ T> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract fun foo(): T
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -17,11 +17,11 @@ package
package p {
public trait B</*0*/ T> {
public interface B</*0*/ T> {
// -- Module: <m1> --
}
public trait C</*0*/ X> : p.B<X> {
public interface C</*0*/ X> : p.B<X> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract override /*1*/ fun foo(): X
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -35,7 +35,7 @@ package
package p {
public trait B</*0*/ T> {
public interface B</*0*/ T> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract fun foo(): T
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -51,11 +51,11 @@ internal fun test(/*0*/ b: p.B<kotlin.String>?): kotlin.Unit
package p {
public trait B</*0*/ T> {
public interface B</*0*/ T> {
// -- Module: <m3> --
}
public trait C</*0*/ X> : p.B<X> {
public interface C</*0*/ X> : p.B<X> {
// -- Module: <m2> --
}
}
compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classVsFunctionGenericsInParamsMismatch.txt
+6 -6
View File
@@ -3,7 +3,7 @@ package
package p {
public trait B</*0*/ T> {
public interface B</*0*/ T> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract fun </*0*/ R> foo(/*0*/ a: T, /*1*/ b: R): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -17,11 +17,11 @@ package
package p {
public trait B</*0*/ T> {
public interface B</*0*/ T> {
// -- Module: <m1> --
}
public trait C : p.B<kotlin.Any?> {
public interface C : p.B<kotlin.Any?> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract override /*1*/ fun </*0*/ R> foo(/*0*/ a: kotlin.Any?, /*1*/ b: R): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -35,7 +35,7 @@ package
package p {
public trait B {
public interface B {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract fun </*0*/ T, /*1*/ R> foo(/*0*/ a: T, /*1*/ b: R): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -51,11 +51,11 @@ internal fun test(/*0*/ b: p.B?, /*1*/ c: p.C): kotlin.Unit
package p {
public trait B {
public interface B {
// -- Module: <m3> --
}
public trait C : p.B<kotlin.Any?> {
public interface C : p.B<kotlin.Any?> {
// -- Module: <m2> --
}
}
compiler/testData/diagnostics/tests/multimodule/duplicateMethod/covariantReturnTypes.txt
+6 -6
View File
@@ -3,7 +3,7 @@ package
package p {
public trait B {
public interface B {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract fun getParent(): p.B?
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -17,11 +17,11 @@ package
package p {
public trait B {
public interface B {
// -- Module: <m1> --
}
public trait C : p.B {
public interface C : p.B {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract override /*1*/ fun getParent(): p.B?
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -35,7 +35,7 @@ package
package p {
public trait B {
public interface B {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract fun getParent(): kotlin.Any?
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -51,11 +51,11 @@ internal fun test(/*0*/ b: p.B?): kotlin.Unit
package p {
public trait B {
public interface B {
// -- Module: <m3> --
}
public trait C : p.B {
public interface C : p.B {
// -- Module: <m2> --
}
}
compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differenceInParamNames.txt
+6 -6
View File
@@ -3,7 +3,7 @@ package
package p {
public trait B {
public interface B {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract fun foo(/*0*/ a: kotlin.Int, /*1*/ b: kotlin.String): p.B?
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -17,11 +17,11 @@ package
package p {
public trait B {
public interface B {
// -- Module: <m1> --
}
public trait C : p.B {
public interface C : p.B {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract override /*1*/ fun foo(/*0*/ a: kotlin.Int, /*1*/ b: kotlin.String): p.B?
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -35,7 +35,7 @@ package
package p {
public trait B {
public interface B {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract fun foo(/*0*/ a1: kotlin.Int, /*1*/ b1: kotlin.String): p.B?
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -51,11 +51,11 @@ internal fun test(/*0*/ b: p.B?): kotlin.Unit
package p {
public trait B {
public interface B {
// -- Module: <m3> --
}
public trait C : p.B {
public interface C : p.B {
// -- Module: <m2> --
}
}
compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differentGenericsInParams.txt
+16 -16
View File
@@ -3,13 +3,13 @@ package
package p {
public trait G1</*0*/ T> {
public interface G1</*0*/ T> {
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 trait G2</*0*/ A, /*1*/ B> {
public interface G2</*0*/ A, /*1*/ 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
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
@@ -22,18 +22,18 @@ package
package p {
public trait B {
public interface B {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract fun foo(/*0*/ a: p.G1<kotlin.Int>?, /*1*/ b: p.G2<p.B, kotlin.String>?): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public trait G1</*0*/ T> {
public interface G1</*0*/ T> {
// -- Module: <m0> --
}
public trait G2</*0*/ A, /*1*/ B> {
public interface G2</*0*/ A, /*1*/ B> {
// -- Module: <m0> --
}
}
@@ -44,22 +44,22 @@ package
package p {
public trait B {
public interface B {
// -- Module: <m1> --
}
public trait C : p.B {
public interface C : p.B {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract override /*1*/ fun foo(/*0*/ a: p.G1<kotlin.Int>?, /*1*/ b: p.G2<p.B, kotlin.String>?): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public trait G1</*0*/ T> {
public interface G1</*0*/ T> {
// -- Module: <m0> --
}
public trait G2</*0*/ A, /*1*/ B> {
public interface G2</*0*/ A, /*1*/ B> {
// -- Module: <m0> --
}
}
@@ -70,18 +70,18 @@ package
package p {
public trait B {
public interface B {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract fun foo(/*0*/ a: p.G1<out kotlin.Any?>?, /*1*/ b: p.G2<kotlin.Int, out kotlin.Any?>?): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public trait G1</*0*/ T> {
public interface G1</*0*/ T> {
// -- Module: <m0> --
}
public trait G2</*0*/ A, /*1*/ B> {
public interface G2</*0*/ A, /*1*/ B> {
// -- Module: <m0> --
}
}
@@ -94,19 +94,19 @@ internal fun test(/*0*/ b: p.B?): kotlin.Unit
package p {
public trait B {
public interface B {
// -- Module: <m3> --
}
public trait C : p.B {
public interface C : p.B {
// -- Module: <m2> --
}
public trait G1</*0*/ T> {
public interface G1</*0*/ T> {
// -- Module: <m0> --
}
public trait G2</*0*/ A, /*1*/ B> {
public interface G2</*0*/ A, /*1*/ B> {
// -- Module: <m0> --
}
}
compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differentNumberOfParams.txt
+6 -6
View File
@@ -3,7 +3,7 @@ package
package p {
public trait B {
public interface B {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract fun foo(/*0*/ a: kotlin.Int, /*1*/ b: kotlin.String): p.B?
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -17,11 +17,11 @@ package
package p {
public trait B {
public interface B {
// -- Module: <m1> --
}
public trait C : p.B {
public interface C : p.B {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract override /*1*/ fun foo(/*0*/ a: kotlin.Int, /*1*/ b: kotlin.String): p.B?
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -35,7 +35,7 @@ package
package p {
public trait B {
public interface B {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract fun foo(/*0*/ a: kotlin.Int, /*1*/ b: kotlin.String, /*2*/ c: kotlin.Int = ...): p.B?
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -51,11 +51,11 @@ internal fun test(/*0*/ b: p.B?): kotlin.Unit
package p {
public trait B {
public interface B {
// -- Module: <m3> --
}
public trait C : p.B {
public interface C : p.B {
// -- Module: <m2> --
}
}
compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differentReturnTypes.txt
+6 -6
View File
@@ -3,7 +3,7 @@ package
package p {
public trait B {
public interface B {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract fun getParent(): p.B?
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -17,11 +17,11 @@ package
package p {
public trait B {
public interface B {
// -- Module: <m1> --
}
public trait C : p.B {
public interface C : p.B {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract override /*1*/ fun getParent(): p.B?
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -35,7 +35,7 @@ package
package p {
public trait B {
public interface B {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract fun getParent(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -51,11 +51,11 @@ internal fun test(/*0*/ b: p.B?): kotlin.Unit
package p {
public trait B {
public interface B {
// -- Module: <m3> --
}
public trait C : p.B {
public interface C : p.B {
// -- Module: <m2> --
}
}
compiler/testData/diagnostics/tests/multimodule/duplicateMethod/extensionMatch.txt
+4 -4
View File
@@ -3,7 +3,7 @@ package
package p {
public trait B {
public interface 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
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
@@ -17,7 +17,7 @@ package
package p {
public trait B {
public interface B {
// -- Module: <m1> --
}
@@ -36,7 +36,7 @@ package
package p {
public trait B {
public interface 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
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
@@ -52,7 +52,7 @@ internal fun p.B.test(): kotlin.Unit
package p {
public trait B {
public interface B {
// -- Module: <m3> --
}
compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParams.txt
+6 -6
View File
@@ -3,7 +3,7 @@ package
package p {
public trait B {
public interface B {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract fun </*0*/ T> foo(/*0*/ a: T): p.B?
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -17,11 +17,11 @@ package
package p {
public trait B {
public interface B {
// -- Module: <m1> --
}
public trait C : p.B {
public interface C : p.B {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract override /*1*/ fun </*0*/ T> foo(/*0*/ a: T): p.B?
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -35,7 +35,7 @@ package
package p {
public trait B {
public interface B {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract fun </*0*/ T> foo(/*0*/ a: T): p.B?
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -52,11 +52,11 @@ internal fun test1(/*0*/ b: p.B?): kotlin.Unit
package p {
public trait B {
public interface B {
// -- Module: <m3> --
}
public trait C : p.B {
public interface C : p.B {
// -- Module: <m2> --
}
}
compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsBoundsMismatch.txt
+8 -8
View File
@@ -3,7 +3,7 @@ package
package p {
public trait B {
public interface B {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract fun </*0*/ T> foo(/*0*/ a: T): p.B?
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -17,11 +17,11 @@ package
package p {
public trait B {
public interface B {
// -- Module: <m1> --
}
public trait C : p.B {
public interface C : p.B {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract override /*1*/ fun </*0*/ T> foo(/*0*/ a: T): p.B?
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -35,14 +35,14 @@ package
package p {
public trait B {
public interface B {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract fun </*0*/ T : p.Tr?> foo(/*0*/ a: T): p.B?
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public trait Tr {
public interface Tr {
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
@@ -57,15 +57,15 @@ internal fun test(/*0*/ b: p.B?): kotlin.Unit
package p {
public trait B {
public interface B {
// -- Module: <m3> --
}
public trait C : p.B {
public interface C : p.B {
// -- Module: <m2> --
}
public trait Tr {
public interface Tr {
// -- Module: <m3> --
}
}
compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsEqNull.txt
+6 -6
View File
@@ -3,7 +3,7 @@ package
package p {
public trait B {
public interface B {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract fun </*0*/ T> foo(/*0*/ a: T): p.B?
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -17,11 +17,11 @@ package
package p {
public trait B {
public interface B {
// -- Module: <m1> --
}
public trait C : p.B {
public interface C : p.B {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract override /*1*/ fun </*0*/ T> foo(/*0*/ a: T): p.B?
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -35,7 +35,7 @@ package
package p {
public trait B {
public interface B {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract fun </*0*/ T> foo(/*0*/ a: T): p.B?
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -54,11 +54,11 @@ internal fun test3(/*0*/ b: p.B?): kotlin.Unit
package p {
public trait B {
public interface B {
// -- Module: <m3> --
}
public trait C : p.B {
public interface C : p.B {
// -- Module: <m2> --
}
}
compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsNotIs.txt
+6 -6
View File
@@ -3,7 +3,7 @@ package
package p {
public trait B {
public interface B {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract fun </*0*/ T> foo(/*0*/ a: T): p.B?
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -17,11 +17,11 @@ package
package p {
public trait B {
public interface B {
// -- Module: <m1> --
}
public trait C : p.B {
public interface C : p.B {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract override /*1*/ fun </*0*/ T> foo(/*0*/ a: T): p.B?
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -35,7 +35,7 @@ package
package p {
public trait B {
public interface B {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract fun </*0*/ T> foo(/*0*/ a: T): p.B?
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -52,11 +52,11 @@ internal fun test1(/*0*/ b: p.B?): kotlin.Unit
package p {
public trait B {
public interface B {
// -- Module: <m3> --
}
public trait C : p.B {
public interface C : p.B {
// -- Module: <m2> --
}
}
compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsReturnFooT.txt
+10 -10
View File
@@ -3,14 +3,14 @@ package
package p {
public trait B {
public interface B {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract fun </*0*/ T> foo(/*0*/ a: T): p.Foo<T>
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public trait Foo</*0*/ T> {
public interface Foo</*0*/ T> {
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
@@ -23,18 +23,18 @@ package
package p {
public trait B {
public interface B {
// -- Module: <m1> --
}
public trait C : p.B {
public interface C : p.B {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract override /*1*/ fun </*0*/ T> foo(/*0*/ a: T): p.Foo<T>
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public trait Foo</*0*/ T> {
public interface Foo</*0*/ T> {
// -- Module: <m1> --
}
}
@@ -45,14 +45,14 @@ package
package p {
public trait B {
public interface B {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract fun </*0*/ T> foo(/*0*/ a: T): p.Foo<T>
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public trait Foo</*0*/ T> {
public interface Foo</*0*/ T> {
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
@@ -68,15 +68,15 @@ internal fun test1(/*0*/ b: p.B?): kotlin.Unit
package p {
public trait B {
public interface B {
// -- Module: <m3> --
}
public trait C : p.B {
public interface C : p.B {
// -- Module: <m2> --
}
public trait Foo</*0*/ T> {
public interface Foo</*0*/ T> {
// -- Module: <m3> --
}
}
compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsReturnT.txt
+6 -6
View File
@@ -3,7 +3,7 @@ package
package p {
public trait B {
public interface B {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract fun </*0*/ T> foo(/*0*/ a: T): T
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -17,11 +17,11 @@ package
package p {
public trait B {
public interface B {
// -- Module: <m1> --
}
public trait C : p.B {
public interface C : p.B {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract override /*1*/ fun </*0*/ T> foo(/*0*/ a: T): T
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -35,7 +35,7 @@ package
package p {
public trait B {
public interface B {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract fun </*0*/ T> foo(/*0*/ a: T): T
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -52,11 +52,11 @@ internal fun test1(/*0*/ b: p.B?): kotlin.Unit
package p {
public trait B {
public interface B {
// -- Module: <m3> --
}
public trait C : p.B {
public interface C : p.B {
// -- Module: <m2> --
}
}
compiler/testData/diagnostics/tests/multimodule/duplicateMethod/noGenericsInParams.txt
+6 -6
View File
@@ -3,7 +3,7 @@ package
package p {
public trait B {
public interface B {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract fun foo(/*0*/ a: kotlin.Int, /*1*/ b: kotlin.String): p.B?
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -17,11 +17,11 @@ package
package p {
public trait B {
public interface B {
// -- Module: <m1> --
}
public trait C : p.B {
public interface C : p.B {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract override /*1*/ fun foo(/*0*/ a: kotlin.Int, /*1*/ b: kotlin.String): p.B?
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -35,7 +35,7 @@ package
package p {
public trait B {
public interface B {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract fun foo(/*0*/ a: kotlin.Int, /*1*/ b: kotlin.String): p.B?
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -51,11 +51,11 @@ internal fun test(/*0*/ b: p.B?): kotlin.Unit
package p {
public trait B {
public interface B {
// -- Module: <m3> --
}
public trait C : p.B {
public interface C : p.B {
// -- Module: <m2> --
}
}
compiler/testData/diagnostics/tests/multimodule/duplicateMethod/noParams.txt
+4 -4
View File
@@ -3,7 +3,7 @@ package
package p {
public trait B {
public interface B {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract fun getParent(): p.B?
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -17,7 +17,7 @@ package
package p {
public trait B {
public interface B {
// -- Module: <m1> --
}
@@ -36,7 +36,7 @@ package
package p {
public trait B {
public interface B {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract fun getParent(): p.B?
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -52,7 +52,7 @@ internal fun test(/*0*/ b: p.B?): kotlin.Unit
package p {
public trait B {
public interface B {
// -- Module: <m3> --
}
compiler/testData/diagnostics/tests/multimodule/duplicateMethod/sameGenericsInParams.txt
+16 -16
View File
@@ -3,13 +3,13 @@ package
package p {
public trait G1</*0*/ T> {
public interface G1</*0*/ T> {
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 trait G2</*0*/ A, /*1*/ B> {
public interface G2</*0*/ A, /*1*/ 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
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
@@ -22,18 +22,18 @@ package
package p {
public trait B {
public interface B {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract fun foo(/*0*/ a: p.G1<kotlin.Int>, /*1*/ b: p.G2<p.B, kotlin.String>): p.B?
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public trait G1</*0*/ T> {
public interface G1</*0*/ T> {
// -- Module: <m0> --
}
public trait G2</*0*/ A, /*1*/ B> {
public interface G2</*0*/ A, /*1*/ B> {
// -- Module: <m0> --
}
}
@@ -44,22 +44,22 @@ package
package p {
public trait B {
public interface B {
// -- Module: <m1> --
}
public trait C : p.B {
public interface C : p.B {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract override /*1*/ fun foo(/*0*/ a: p.G1<kotlin.Int>, /*1*/ b: p.G2<p.B, kotlin.String>): p.B?
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public trait G1</*0*/ T> {
public interface G1</*0*/ T> {
// -- Module: <m0> --
}
public trait G2</*0*/ A, /*1*/ B> {
public interface G2</*0*/ A, /*1*/ B> {
// -- Module: <m0> --
}
}
@@ -70,18 +70,18 @@ package
package p {
public trait B {
public interface B {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract fun foo(/*0*/ a: p.G1<kotlin.Int>, /*1*/ b: p.G2<p.B, kotlin.String>): p.B?
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public trait G1</*0*/ T> {
public interface G1</*0*/ T> {
// -- Module: <m0> --
}
public trait G2</*0*/ A, /*1*/ B> {
public interface G2</*0*/ A, /*1*/ B> {
// -- Module: <m0> --
}
}
@@ -94,19 +94,19 @@ internal fun test(/*0*/ b: p.B?, /*1*/ a: p.G1<kotlin.Int>, /*2*/ b1: p.G2<p.B,
package p {
public trait B {
public interface B {
// -- Module: <m3> --
}
public trait C : p.B {
public interface C : p.B {
// -- Module: <m2> --
}
public trait G1</*0*/ T> {
public interface G1</*0*/ T> {
// -- Module: <m0> --
}
public trait G2</*0*/ A, /*1*/ B> {
public interface G2</*0*/ A, /*1*/ B> {
// -- Module: <m0> --
}
}
compiler/testData/diagnostics/tests/multimodule/duplicateMethod/simpleWithInheritance.txt
+8 -8
View File
@@ -3,7 +3,7 @@ package
package p {
public trait B {
public interface B {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract fun getParent(): p.B?
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -17,11 +17,11 @@ package
package p {
public trait B {
public interface B {
// -- Module: <m1> --
}
public trait C : p.B {
public interface C : p.B {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract override /*1*/ fun getParent(): p.B?
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -35,14 +35,14 @@ package
package p {
public trait B {
public interface B {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract fun getParent(): p.B?
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public trait D : p.B {
public interface D : p.B {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract override /*1*/ fun getParent(): p.B?
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -58,15 +58,15 @@ internal fun test(/*0*/ b: p.B?): kotlin.Unit
package p {
public trait B {
public interface B {
// -- Module: <m3> --
}
public trait C : p.B {
public interface C : p.B {
// -- Module: <m2> --
}
public trait D : p.B {
public interface D : p.B {
// -- Module: <m3> --
}
}
compiler/testData/diagnostics/tests/multimodule/duplicateMethod/substitutedGenericInParams.txt
+6 -6
View File
@@ -3,7 +3,7 @@ package
package p {
public trait B</*0*/ T> {
public interface B</*0*/ T> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract fun foo(/*0*/ a: T): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -17,11 +17,11 @@ package
package p {
public trait B</*0*/ T> {
public interface B</*0*/ T> {
// -- Module: <m1> --
}
public trait C : p.B<kotlin.String> {
public interface C : p.B<kotlin.String> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract override /*1*/ fun foo(/*0*/ a: kotlin.String): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -35,7 +35,7 @@ package
package p {
public trait B {
public interface B {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract fun foo(/*0*/ a: kotlin.String): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -51,11 +51,11 @@ internal fun test(/*0*/ b: p.B?): kotlin.Unit
package p {
public trait B {
public interface B {
// -- Module: <m3> --
}
public trait C : p.B<kotlin.String> {
public interface C : p.B<kotlin.String> {
// -- Module: <m2> --
}
}
compiler/testData/diagnostics/tests/multimodule/duplicateSuper/differentSuperTraits.txt
+10 -10
View File
@@ -3,21 +3,21 @@ package
package p {
public trait A : p.Base {
public interface A : p.Base {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ fun foo(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public trait Base {
public interface Base {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open fun foo(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public trait C : p.A {
public interface C : p.A {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun foo(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -31,14 +31,14 @@ package
package p {
public trait B : p.Base {
public interface B : p.Base {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun foo(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public trait Base {
public interface Base {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open fun foo(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -60,23 +60,23 @@ internal final class Foo : p.C, p.B {
package p {
public trait A : p.Base {
public interface A : p.Base {
// -- Module: <m1> --
}
public trait B : p.Base {
public interface B : p.Base {
// -- Module: <m2> --
}
public trait Base {
public interface Base {
// -- Module: <m1> --
}
public trait Base {
public interface Base {
// -- Module: <m2> --
}
public trait C : p.A {
public interface C : p.A {
// -- Module: <m1> --
}
}
compiler/testData/diagnostics/tests/multimodule/duplicateSuper/sameSuperTrait.txt
+8 -8
View File
@@ -3,14 +3,14 @@ package
package p {
public trait A : p.Base {
public interface A : p.Base {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun foo(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public trait Base {
public interface Base {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open fun foo(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -24,14 +24,14 @@ package
package p {
public trait B : p.Base {
public interface B : p.Base {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun foo(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public trait Base {
public interface Base {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open fun foo(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -53,19 +53,19 @@ internal final class Foo : p.A, p.B {
package p {
public trait A : p.Base {
public interface A : p.Base {
// -- Module: <m1> --
}
public trait B : p.Base {
public interface B : p.Base {
// -- Module: <m2> --
}
public trait Base {
public interface Base {
// -- Module: <m1> --
}
public trait Base {
public interface Base {
// -- Module: <m2> --
}
}
compiler/testData/diagnostics/tests/multimodule/duplicateSuper/sameSuperTraitDifferentBounds.txt
+8 -8
View File
@@ -3,14 +3,14 @@ package
package p {
public trait A : p.Base {
public interface A : p.Base {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun </*0*/ T> foo(/*0*/ t: kotlin.Array<T>): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public trait Base {
public interface Base {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open fun </*0*/ T> foo(/*0*/ t: kotlin.Array<T>): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -24,14 +24,14 @@ package
package p {
public trait B : p.Base {
public interface B : p.Base {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun </*0*/ T : p.Base> foo(/*0*/ t: kotlin.Array<T>): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public trait Base {
public interface Base {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open fun </*0*/ T : p.Base> foo(/*0*/ t: kotlin.Array<T>): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -54,19 +54,19 @@ internal final class Foo : p.A, p.B {
package p {
public trait A : p.Base {
public interface A : p.Base {
// -- Module: <m1> --
}
public trait B : p.Base {
public interface B : p.Base {
// -- Module: <m2> --
}
public trait Base {
public interface Base {
// -- Module: <m1> --
}
public trait Base {
public interface Base {
// -- Module: <m2> --
}
}
compiler/testData/diagnostics/tests/multimodule/duplicateSuper/sameSuperTraitGenerics.txt
+8 -8
View File
@@ -3,14 +3,14 @@ package
package p {
public trait A</*0*/ T> : p.Base<T> {
public interface A</*0*/ T> : p.Base<T> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun foo(/*0*/ t: T): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public trait Base</*0*/ T> {
public interface Base</*0*/ T> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open fun foo(/*0*/ t: T): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -24,14 +24,14 @@ package
package p {
public trait B : p.Base<kotlin.String> {
public interface B : p.Base<kotlin.String> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun foo(/*0*/ t: kotlin.String): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public trait Base</*0*/ T> {
public interface Base</*0*/ T> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open fun foo(/*0*/ t: T): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -53,19 +53,19 @@ internal final class Foo : p.A<kotlin.String>, p.B {
package p {
public trait A</*0*/ T> : p.Base<T> {
public interface A</*0*/ T> : p.Base<T> {
// -- Module: <m1> --
}
public trait B : p.Base<kotlin.String> {
public interface B : p.Base<kotlin.String> {
// -- Module: <m2> --
}
public trait Base</*0*/ T> {
public interface Base</*0*/ T> {
// -- Module: <m1> --
}
public trait Base</*0*/ T> {
public interface Base</*0*/ T> {
// -- Module: <m2> --
}
}