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/thisAndSuper/Super.txt
+2 -2
View File
@@ -46,14 +46,14 @@ package example {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait G</*0*/ T> {
internal interface G</*0*/ T> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal 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
}
internal trait T {
internal interface T {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal open fun foo(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/tests/thisAndSuper/notAccessibleSuperInTrait.txt
+1 -1
View File
@@ -8,7 +8,7 @@ internal open class A {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait ATrait : A {
internal interface ATrait : A {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal open override /*1*/ fun foo(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/tests/thisAndSuper/thisInPropertyInitializer.txt
+1 -1
View File
@@ -2,7 +2,7 @@ package
internal val kotlin.String.test: Base
internal trait Base {
internal interface Base {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal abstract fun foo(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/tests/thisAndSuper/traitSuperCall.txt
+2 -2
View File
@@ -10,7 +10,7 @@ internal final class A : KTrait {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait KTrait : Test {
internal interface KTrait : Test {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
internal open fun ktest(): kotlin.Unit
@@ -18,7 +18,7 @@ internal trait KTrait : Test {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public trait Test {
public interface Test {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
internal open fun test(): kotlin.String