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/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