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/inner/deepInnerClass.txt
+1 -1
View File
@@ -15,7 +15,7 @@ internal final class A</*0*/ T> {
}
}
internal trait P</*0*/ U, /*1*/ Y> {
internal interface P</*0*/ U, /*1*/ Y> {
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/inner/extensionLambdaInsideNestedClass.txt
+1 -1
View File
@@ -17,7 +17,7 @@ package f {
}
}
internal trait ActionContext {
internal interface ActionContext {
internal abstract val session: kotlin.Map<kotlin.String, 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/inner/illegalModifier.txt
+3 -3
View File
@@ -11,7 +11,7 @@ internal final class A {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait B {
internal interface B {
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
@@ -44,7 +44,7 @@ internal final class D {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait F {
internal interface F {
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
@@ -117,7 +117,7 @@ internal final enum class H : kotlin.Enum<H> {
public final /*synthesized*/ fun values(): kotlin.Array<H>
}
internal trait K {
internal interface K {
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/inner/innerThisSuper.txt
+1 -1
View File
@@ -35,7 +35,7 @@ internal final class Outer : Trait {
}
}
internal trait Trait {
internal interface Trait {
internal open fun 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/inner/localThisSuper.txt
+1 -1
View File
@@ -9,7 +9,7 @@ internal final class Outer : Trait {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait Trait {
internal interface Trait {
internal open fun 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/inner/nestedClassAccessedViaInstanceReference.txt
+1 -1
View File
@@ -2,7 +2,7 @@ package
internal fun test(/*0*/ with: WithClassObject, /*1*/ without: WithoutClassObject, /*2*/ obj: Obj): kotlin.Unit
internal trait N {
internal interface N {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal open fun foo(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/tests/inner/outerProtectedMember.txt
+1 -1
View File
@@ -16,7 +16,7 @@ internal final class Foo {
}
}
internal trait I {
internal interface I {
internal abstract val x: 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/inner/traits.txt
+3 -3
View File
@@ -1,20 +1,20 @@
package
internal trait Foo {
internal interface Foo {
internal abstract val b: Foo.Bar
internal abstract val b1: Foo.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
internal trait Bar {
internal interface 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
}
}
internal trait Foo2 : Foo {
internal interface Foo2 : Foo {
internal abstract override /*1*/ /*fake_override*/ val b: Foo.Bar
internal abstract override /*1*/ /*fake_override*/ val b1: Foo.Bar
internal abstract val bb1: Foo.Bar