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/MultipleBounds.txt
+2 -2
View File
@@ -16,7 +16,7 @@ package Jet87 {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait B {
internal interface B {
internal open fun bar(): kotlin.Double
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -69,7 +69,7 @@ package Jet87 {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait G</*0*/ X> {
internal interface G</*0*/ X> {
internal abstract val </*0*/ A : Jet87.B> bal: kotlin.Double
internal abstract val </*0*/ Y : Jet87.B> bas: kotlin.Double
internal abstract val </*0*/ X : Jet87.A> boo: kotlin.Double where X : Jet87.B