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/SuspiciousCase1.txt
+2 -2
View File
@@ -2,7 +2,7 @@ package
internal fun zz(/*0*/ b: Baz): kotlin.Int
internal trait Bar</*0*/ Q> : Foo<Q> {
internal interface Bar</*0*/ Q> : Foo<Q> {
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 override /*1*/ /*fake_override*/ fun quux(/*0*/ p: Q, /*1*/ q: kotlin.Int = ...): kotlin.Int
@@ -17,7 +17,7 @@ internal abstract class Baz : Bar<kotlin.String> {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait Foo</*0*/ P> {
internal interface Foo</*0*/ P> {
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 quux(/*0*/ p: P, /*1*/ q: kotlin.Int = ...): kotlin.Int