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/j+k/GenericsInSupertypes.txt
+2 -2
View File
@@ -57,7 +57,7 @@ internal abstract class K : p.C<p.P> {
package p {
public trait A</*0*/ TA> {
public interface A</*0*/ TA> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal abstract fun foo(/*0*/ p: p.A<TA>): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -80,7 +80,7 @@ package p {
public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
}
public trait G</*0*/ TG> {
public interface G</*0*/ TG> {
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/j+k/InnerClassFromJava.txt
+3 -3
View File
@@ -6,7 +6,7 @@ public open class Bar : Foo {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public trait I : Boo {
public interface I : Boo {
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
@@ -20,13 +20,13 @@ public final class Baz : Bar.I {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait Boo {
internal interface Boo {
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
}
public trait Foo {
public interface Foo {
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/j+k/inheritAbstractSamAdapter.txt
+2 -2
View File
@@ -2,7 +2,7 @@ package
public /*synthesized*/ fun A(/*0*/ function: (java.lang.Runnable!) -> kotlin.Unit): A
public trait A {
public interface A {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public final /*synthesized*/ fun foo(/*0*/ r: (() -> kotlin.Unit)!): kotlin.Unit
public abstract fun foo(/*0*/ r: java.lang.Runnable!): kotlin.Unit
@@ -10,7 +10,7 @@ public trait A {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public trait B : A {
public interface B : A {
public final /*synthesized*/ fun bar(/*0*/ r: (() -> kotlin.Unit)!): kotlin.Unit
public abstract fun bar(/*0*/ r: java.lang.Runnable!): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
compiler/testData/diagnostics/tests/j+k/kt3307.txt
+1 -1
View File
@@ -2,7 +2,7 @@ package
internal fun TestBug(): kotlin.Unit
public trait Bug {
public interface Bug {
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 abstract fun </*0*/ RET : Bug!> save(): RET!
compiler/testData/diagnostics/tests/j+k/kt6720_abstractProperty.txt
+1 -1
View File
@@ -2,7 +2,7 @@ package
internal fun main(): kotlin.Unit
internal trait A {
internal interface A {
internal abstract val a: 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/j+k/overrideRawType.txt
+1 -1
View File
@@ -2,7 +2,7 @@ package
public /*synthesized*/ fun Bar(/*0*/ function: (Foo<*>!) -> kotlin.Unit): Bar
public trait Bar {
public interface Bar {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract fun f(/*0*/ f: Foo<*>!): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/tests/j+k/traitDefaultCall.txt
+2 -2
View File
@@ -10,7 +10,7 @@ internal final class A : KTrait {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait KTrait : Test {
internal interface KTrait : Test {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
internal open fun ktest(): kotlin.Unit
@@ -18,7 +18,7 @@ internal trait KTrait : Test {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public trait Test {
public interface Test {
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 fun test(): kotlin.String!