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/secondaryConstructors/constructorInTrait.txt
+1 -1
View File
@@ -1,6 +1,6 @@
package
internal trait A {
internal 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
compiler/testData/diagnostics/tests/secondaryConstructors/delegationByWithoutPrimary.txt
+1 -1
View File
@@ -1,6 +1,6 @@
package
internal trait A {
internal 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
compiler/testData/diagnostics/tests/secondaryConstructors/membersInitializationWithPrimary.txt
-19
View File
@@ -1,19 +0,0 @@
package
internal final class A {
public constructor A()
public constructor A(/*0*/ w: kotlin.Char)
public constructor A(/*0*/ a: kotlin.Int, /*1*/ b: kotlin.Int = ...)
internal final val overinitialized: kotlin.Int
internal final val uninitialized: kotlin.Int
internal final val useInitialized: kotlin.Int
internal final val useUnitialized: kotlin.Int
internal final val v: kotlin.Int = -1
internal final val w: kotlin.Char
internal final val x: kotlin.Int
internal final var y: kotlin.Int
internal final val z: kotlin.Int
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
}
compiler/testData/diagnostics/tests/secondaryConstructors/membersInitializationWithoutPrimary.txt
-20
View File
@@ -1,20 +0,0 @@
package
internal final class A {
public constructor A()
public constructor A(/*0*/ a: kotlin.Double, /*1*/ b: kotlin.Int = ...)
public constructor A(/*0*/ a: kotlin.Int, /*1*/ b: kotlin.Int = ...)
public constructor A(/*0*/ x: kotlin.String)
public constructor A(/*0*/ a: kotlin.String, /*1*/ b: kotlin.Int = ...)
internal final val overinitialized: kotlin.Int
internal final val uninitialized: kotlin.Int
internal final val useInitialized: kotlin.Int
internal final val useUnitialized: kotlin.Int
internal final val v: kotlin.Int = -1
internal final val x: kotlin.Int
internal final var y: kotlin.Int
internal final val z: kotlin.Int
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
}
compiler/testData/diagnostics/tests/secondaryConstructors/noSupertypeInitWithSecondaryConstructors.txt
+2 -2
View File
@@ -14,13 +14,13 @@ internal open class B {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait C {
internal 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
}
internal trait D {
internal interface D {
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
compiler/testData/diagnostics/tests/secondaryConstructors/superSecondaryNonExisting.txt
+1 -1
View File
@@ -17,7 +17,7 @@ internal open class B {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait C {
internal 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