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/testsWithJsStdLib/dynamicTypes/delegationBy.txt
+1 -1
View File
@@ -8,7 +8,7 @@ internal final class C : Tr {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait Tr {
internal interface Tr {
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
compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/inference.txt
+1 -1
View File
@@ -20,7 +20,7 @@ internal final class In</*0*/ in T> {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait Tr {
internal interface Tr {
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/testsWithJsStdLib/dynamicTypes/overrides.txt
+6 -6
View File
@@ -1,6 +1,6 @@
package
internal trait A {
internal interface A {
internal abstract fun dynamic(/*0*/ p: dynamic): dynamic
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal abstract fun foo(/*0*/ p: P): R
@@ -8,14 +8,14 @@ internal trait A {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait A1 {
internal interface A1 {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal abstract fun foo(/*0*/ p: dynamic): dynamic
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*/ fun dynamic(/*0*/ p: P): R
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal abstract override /*1*/ fun foo(/*0*/ p: dynamic): dynamic
@@ -23,7 +23,7 @@ internal trait B : A {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait C : A, A1 {
internal interface C : A, A1 {
internal abstract override /*1*/ /*fake_override*/ fun dynamic(/*0*/ p: dynamic): dynamic
public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal abstract override /*2*/ /*fake_override*/ fun foo(/*0*/ p: dynamic): dynamic
@@ -31,13 +31,13 @@ internal trait C : A, A1 {
public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait P {
internal interface P {
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 R {
internal interface R {
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/testsWithJsStdLib/dynamicTypes/supertypesAndBounds.txt
+1 -1
View File
@@ -9,7 +9,7 @@ internal final class C</*0*/ T : dynamic> {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait Tr {
internal interface Tr {
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/testsWithJsStdLib/native/optionlBody/native.txt
+1 -1
View File
@@ -42,7 +42,7 @@ kotlin.js.native() internal object O {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
kotlin.js.native() internal trait T {
kotlin.js.native() internal interface T {
internal abstract val baz: kotlin.Int
internal open fun bar(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
compiler/testData/diagnostics/testsWithJsStdLib/native/optionlBody/nativeGetter.txt
+1 -1
View File
@@ -3,7 +3,7 @@ package
kotlin.js.nativeGetter() internal fun kotlin.String.bar(/*0*/ n: kotlin.Int): kotlin.Int?
kotlin.js.nativeGetter() internal fun kotlin.String.foo(/*0*/ n: kotlin.Int): kotlin.Int?
kotlin.js.native() internal trait T {
kotlin.js.native() internal interface T {
kotlin.js.nativeGetter() internal open fun bar(/*0*/ d: kotlin.Double): kotlin.String?
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
kotlin.js.nativeGetter() internal abstract fun foo(/*0*/ d: kotlin.Double): kotlin.String?
compiler/testData/diagnostics/testsWithJsStdLib/unsupportedFeatures/nestedInnerClassifier.txt
+13 -13
View File
@@ -33,12 +33,12 @@ internal final class A {
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
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
@@ -108,12 +108,12 @@ internal final class A {
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
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
@@ -191,12 +191,12 @@ internal final enum class E : kotlin.Enum<E> {
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
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
@@ -266,12 +266,12 @@ internal final enum class E : kotlin.Enum<E> {
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
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
@@ -297,7 +297,7 @@ internal final enum class E : kotlin.Enum<E> {
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
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
@@ -329,12 +329,12 @@ internal trait T {
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
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
@@ -397,12 +397,12 @@ internal trait T {
public final /*synthesized*/ fun values(): kotlin.Array<T.E>
}
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
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