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/enum/AbstractOverrideInEnum.txt
+1 -1
View File
@@ -26,7 +26,7 @@ internal final enum class E : kotlin.Enum<E>, T {
public final /*synthesized*/ fun values(): kotlin.Array<E>
}
internal trait T {
internal interface T {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal abstract fun f(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/tests/enum/enumImplementingTrait.txt
+2 -2
View File
@@ -74,14 +74,14 @@ internal final enum class EnumImplementingTraitWithVal : kotlin.Enum<EnumImpleme
public final /*synthesized*/ fun values(): kotlin.Array<EnumImplementingTraitWithVal>
}
internal trait T1 {
internal interface T1 {
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
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait T2 {
internal interface T2 {
internal abstract val bar: 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
compiler/testData/diagnostics/tests/enum/enumInheritance.txt
+1 -1
View File
@@ -60,7 +60,7 @@ internal final enum class MyEnumBase : kotlin.Enum<MyEnumBase> {
public final /*synthesized*/ fun values(): kotlin.Array<MyEnumBase>
}
internal trait MyTrait {
internal interface MyTrait {
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/enum/enumModifier.txt
+1 -1
View File
@@ -39,7 +39,7 @@ internal object O {
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
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
compiler/testData/diagnostics/tests/enum/inner/insideTrait.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