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/multimodule/duplicateSuper/differentSuperTraits.txt
+10 -10
View File
@@ -3,21 +3,21 @@ package
package p {
public trait A : p.Base {
public interface A : p.Base {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ fun foo(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public trait Base {
public interface Base {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open fun foo(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public trait C : p.A {
public interface C : p.A {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun foo(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -31,14 +31,14 @@ package
package p {
public trait B : p.Base {
public interface B : p.Base {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun foo(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public trait Base {
public interface Base {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open fun foo(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -60,23 +60,23 @@ internal final class Foo : p.C, p.B {
package p {
public trait A : p.Base {
public interface A : p.Base {
// -- Module: <m1> --
}
public trait B : p.Base {
public interface B : p.Base {
// -- Module: <m2> --
}
public trait Base {
public interface Base {
// -- Module: <m1> --
}
public trait Base {
public interface Base {
// -- Module: <m2> --
}
public trait C : p.A {
public interface C : p.A {
// -- Module: <m1> --
}
}
compiler/testData/diagnostics/tests/multimodule/duplicateSuper/sameSuperTrait.txt
+8 -8
View File
@@ -3,14 +3,14 @@ package
package p {
public trait A : p.Base {
public interface A : p.Base {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun foo(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public trait Base {
public interface Base {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open fun foo(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -24,14 +24,14 @@ package
package p {
public trait B : p.Base {
public interface B : p.Base {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun foo(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public trait Base {
public interface Base {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open fun foo(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -53,19 +53,19 @@ internal final class Foo : p.A, p.B {
package p {
public trait A : p.Base {
public interface A : p.Base {
// -- Module: <m1> --
}
public trait B : p.Base {
public interface B : p.Base {
// -- Module: <m2> --
}
public trait Base {
public interface Base {
// -- Module: <m1> --
}
public trait Base {
public interface Base {
// -- Module: <m2> --
}
}
compiler/testData/diagnostics/tests/multimodule/duplicateSuper/sameSuperTraitDifferentBounds.txt
+8 -8
View File
@@ -3,14 +3,14 @@ package
package p {
public trait A : p.Base {
public interface A : p.Base {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun </*0*/ T> foo(/*0*/ t: kotlin.Array<T>): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public trait Base {
public interface Base {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open fun </*0*/ T> foo(/*0*/ t: kotlin.Array<T>): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -24,14 +24,14 @@ package
package p {
public trait B : p.Base {
public interface B : p.Base {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun </*0*/ T : p.Base> foo(/*0*/ t: kotlin.Array<T>): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public trait Base {
public interface Base {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open fun </*0*/ T : p.Base> foo(/*0*/ t: kotlin.Array<T>): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -54,19 +54,19 @@ internal final class Foo : p.A, p.B {
package p {
public trait A : p.Base {
public interface A : p.Base {
// -- Module: <m1> --
}
public trait B : p.Base {
public interface B : p.Base {
// -- Module: <m2> --
}
public trait Base {
public interface Base {
// -- Module: <m1> --
}
public trait Base {
public interface Base {
// -- Module: <m2> --
}
}
compiler/testData/diagnostics/tests/multimodule/duplicateSuper/sameSuperTraitGenerics.txt
+8 -8
View File
@@ -3,14 +3,14 @@ package
package p {
public trait A</*0*/ T> : p.Base<T> {
public interface A</*0*/ T> : p.Base<T> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun foo(/*0*/ t: T): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public trait Base</*0*/ T> {
public interface Base</*0*/ T> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open fun foo(/*0*/ t: T): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -24,14 +24,14 @@ package
package p {
public trait B : p.Base<kotlin.String> {
public interface B : p.Base<kotlin.String> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun foo(/*0*/ t: kotlin.String): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public trait Base</*0*/ T> {
public interface Base</*0*/ T> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open fun foo(/*0*/ t: T): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -53,19 +53,19 @@ internal final class Foo : p.A<kotlin.String>, p.B {
package p {
public trait A</*0*/ T> : p.Base<T> {
public interface A</*0*/ T> : p.Base<T> {
// -- Module: <m1> --
}
public trait B : p.Base<kotlin.String> {
public interface B : p.Base<kotlin.String> {
// -- Module: <m2> --
}
public trait Base</*0*/ T> {
public interface Base</*0*/ T> {
// -- Module: <m1> --
}
public trait Base</*0*/ T> {
public interface Base</*0*/ T> {
// -- Module: <m2> --
}
}