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/inner/traits.txt
+3 -3
View File
@@ -1,20 +1,20 @@
package
internal trait Foo {
internal interface Foo {
internal abstract val b: Foo.Bar
internal abstract val b1: Foo.Bar
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 Bar {
internal interface Bar {
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 Foo2 : Foo {
internal interface Foo2 : Foo {
internal abstract override /*1*/ /*fake_override*/ val b: Foo.Bar
internal abstract override /*1*/ /*fake_override*/ val b1: Foo.Bar
internal abstract val bb1: Foo.Bar