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