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/duplicateMethod/simpleWithInheritance.txt
+8 -8
View File
@@ -3,7 +3,7 @@ package
package p {
public trait B {
public interface B {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract fun getParent(): p.B?
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -17,11 +17,11 @@ package
package p {
public trait B {
public interface B {
// -- Module: <m1> --
}
public trait C : p.B {
public interface C : p.B {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract override /*1*/ fun getParent(): p.B?
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -35,14 +35,14 @@ package
package p {
public trait B {
public interface B {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract fun getParent(): p.B?
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public trait D : p.B {
public interface D : p.B {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract override /*1*/ fun getParent(): p.B?
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -58,15 +58,15 @@ internal fun test(/*0*/ b: p.B?): kotlin.Unit
package p {
public trait B {
public interface B {
// -- Module: <m3> --
}
public trait C : p.B {
public interface C : p.B {
// -- Module: <m2> --
}
public trait D : p.B {
public interface D : p.B {
// -- Module: <m3> --
}
}