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/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> --
}
}