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/traitWithRequired/abstractClass.txt
+1 -1
View File
@@ -21,7 +21,7 @@ internal open class Required {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait Trait : Required {
internal interface Trait : Required {
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/traitWithRequired/anonymousObjectExtendsTraitWithRequired.txt
+1 -1
View File
@@ -3,7 +3,7 @@ package
internal val a: A
internal val b: A
internal trait A : Required {
internal interface A : Required {
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/traitWithRequired/differentGenericArguments.txt
+2 -2
View File
@@ -1,12 +1,12 @@
package
internal trait A : Generic<kotlin.Int> {
internal interface A : Generic<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
}
internal trait B : Generic<kotlin.String> {
internal interface B : Generic<kotlin.String> {
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/traitWithRequired/kt3006.txt
+1 -1
View File
@@ -9,7 +9,7 @@ internal open class Base {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait Derived : Base {
internal interface Derived : Base {
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/traitWithRequired/manyRequirementsDisallowed.txt
+1 -1
View File
@@ -14,7 +14,7 @@ internal open class B {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait C : A, B {
internal interface C : A, B {
public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
compiler/testData/diagnostics/tests/traitWithRequired/manyTraitsRequireSameClass.txt
+4 -4
View File
@@ -1,24 +1,24 @@
package
internal trait A : Required {
internal interface A : Required {
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 B : A, Required {
internal interface B : A, Required {
public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait C : Required {
internal interface C : Required {
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 : B, Required {
internal interface D : B, Required {
public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
compiler/testData/diagnostics/tests/traitWithRequired/requirementFulfilledBySubclass.txt
+1 -1
View File
@@ -28,7 +28,7 @@ internal open class RequiredDerived : RequiredBase {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait Trait : RequiredBase {
internal interface Trait : RequiredBase {
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/traitWithRequired/traitExtendsTraitWithRequired.txt
+2 -2
View File
@@ -1,6 +1,6 @@
package
internal trait First : Required {
internal interface First : Required {
internal final override /*1*/ /*fake_override*/ val value: kotlin.String
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -15,7 +15,7 @@ internal open class Required {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait Second : First {
internal interface Second : First {
internal final override /*1*/ /*fake_override*/ val value: kotlin.String
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/tests/traitWithRequired/traitRequiresAny.txt
+1 -1
View File
@@ -1,6 +1,6 @@
package
internal trait AnyTrait {
internal interface AnyTrait {
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/traitWithRequired/traitSupertypeList.txt
+2 -2
View File
@@ -1,6 +1,6 @@
package
internal trait Foo : bar, bar, bar {
internal interface Foo : bar, bar, bar {
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
@@ -20,7 +20,7 @@ internal open class Foo12 : bar, bar {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait Foo2 : bar, Foo {
internal interface Foo2 : bar, Foo {
public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
compiler/testData/diagnostics/tests/traitWithRequired/uninheritableTraitDifferentGenericArguments.txt
+3 -3
View File
@@ -1,18 +1,18 @@
package
internal trait A : Generic<kotlin.String> {
internal interface A : Generic<kotlin.String> {
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 B : Generic<kotlin.Int> {
internal interface B : Generic<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
}
internal trait C : A, B {
internal interface C : A, B {
public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String