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/override/parameterNames/changeOnOverrideDiagnostic.txt
+2 -2
View File
@@ -1,13 +1,13 @@
package
internal trait A {
internal interface A {
internal abstract fun b(/*0*/ a: kotlin.Int): kotlin.Unit
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 {
internal interface B : A {
internal abstract override /*1*/ /*fake_override*/ fun b(/*0*/ a: kotlin.Int): kotlin.Unit
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/override/parameterNames/differentNamesInSupertypesDiagnostic.txt
+4 -4
View File
@@ -1,27 +1,27 @@
package
internal trait C {
internal interface C {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal abstract fun foo(/*0*/ a: kotlin.Int): kotlin.Unit
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
internal abstract fun foo(/*0*/ b: kotlin.Int): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait E : C, D {
internal interface E : C, D {
public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal abstract override /*2*/ /*fake_override*/ fun foo(/*0*/ b: kotlin.Int): kotlin.Unit
public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait F : C, D {
internal interface F : C, D {
public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal open override /*2*/ fun foo(/*0*/ a: kotlin.Int): kotlin.Unit
public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/tests/override/parameterNames/jjkHierarchy.txt
+2 -2
View File
@@ -3,7 +3,7 @@ package
public/*package*/ /*synthesized*/ fun Sub(/*0*/ function: (kotlin.Long) -> kotlin.Unit): Sub
public/*package*/ /*synthesized*/ fun Super(/*0*/ function: (kotlin.Long) -> kotlin.Unit): Super
public/*package*/ trait Sub : Super {
public/*package*/ interface Sub : Super {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ superName: kotlin.Long): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -18,7 +18,7 @@ internal final class SubSub : Sub {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public/*package*/ trait Super {
public/*package*/ interface Super {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract fun foo(/*0*/ superName: kotlin.Long): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/tests/override/parameterNames/kjkHierarchy.txt
+2 -2
View File
@@ -2,7 +2,7 @@ package
public/*package*/ /*synthesized*/ fun Sub(/*0*/ function: (kotlin.Int) -> kotlin.Unit): Sub
public/*package*/ trait Sub : Super {
public/*package*/ interface Sub : Super {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ superName: kotlin.Int): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -17,7 +17,7 @@ internal final class SubSub : Sub {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait Super {
internal interface Super {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal abstract fun foo(/*0*/ superName: kotlin.Int): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/tests/override/parameterNames/kjkWithSeveralSupers.txt
+6 -6
View File
@@ -6,42 +6,42 @@ public/*package*/ /*synthesized*/ fun Sub1(/*0*/ function: (kotlin.Int) -> kotli
public/*package*/ /*synthesized*/ fun Sub2(/*0*/ function: (kotlin.Int) -> kotlin.Unit): Sub2
public/*package*/ /*synthesized*/ fun Sub3(/*0*/ function: (kotlin.Int) -> kotlin.Unit): Sub3
public/*package*/ trait JSuper1 {
public/*package*/ interface JSuper1 {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract fun foo(/*0*/ jsuper1Name: kotlin.Int): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public/*package*/ trait JSuper2 {
public/*package*/ interface JSuper2 {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract fun foo(/*0*/ jsuper2Name: kotlin.Int): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait KSuper {
internal interface KSuper {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal abstract fun foo(/*0*/ ksuperName: kotlin.Int): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public/*package*/ trait Sub1 : KSuper, JSuper1, JSuper2 {
public/*package*/ interface Sub1 : KSuper, JSuper1, JSuper2 {
public open override /*3*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
java.lang.Override() public abstract override /*3*/ fun foo(/*0*/ ksuperName: kotlin.Int): kotlin.Unit
public open override /*3*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*3*/ /*fake_override*/ fun toString(): kotlin.String
}
public/*package*/ trait Sub2 : JSuper1, KSuper, JSuper2 {
public/*package*/ interface Sub2 : JSuper1, KSuper, JSuper2 {
public open override /*3*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
java.lang.Override() public abstract override /*3*/ fun foo(/*0*/ ksuperName: kotlin.Int): kotlin.Unit
public open override /*3*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*3*/ /*fake_override*/ fun toString(): kotlin.String
}
public/*package*/ trait Sub3 : JSuper1, JSuper2, KSuper {
public/*package*/ interface Sub3 : JSuper1, JSuper2, KSuper {
public open override /*3*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
java.lang.Override() public abstract override /*3*/ fun foo(/*0*/ ksuperName: kotlin.Int): kotlin.Unit
public open override /*3*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/tests/override/parameterNames/kotlinInheritsBothJavaAndKotlin.txt
+2 -2
View File
@@ -10,14 +10,14 @@ internal final class BothTraitsSubclass : JavaInterface, KotlinTrait {
public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
}
public/*package*/ trait JavaInterface {
public/*package*/ interface JavaInterface {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract fun foo(/*0*/ javaName: kotlin.Int): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait KotlinTrait {
internal interface KotlinTrait {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open fun foo(/*0*/ someOtherName: kotlin.Int): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/tests/override/parameterNames/kotlinInheritsJava.txt
+2 -2
View File
@@ -2,7 +2,7 @@ package
public/*package*/ /*synthesized*/ fun JavaInterface(/*0*/ function: (kotlin.Int) -> kotlin.Unit): JavaInterface
public/*package*/ trait JavaInterface {
public/*package*/ interface JavaInterface {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract fun foo(/*0*/ javaName: kotlin.Int): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -25,7 +25,7 @@ internal final class Subclass : SubtraitWithFakeOverride {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait SubtraitWithFakeOverride : JavaInterface {
internal interface SubtraitWithFakeOverride : JavaInterface {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ javaName: kotlin.Int): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int