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/jjkHierarchy.txt
+2 -2
View File
@@ -3,7 +3,7 @@ package
public/*package*/ /*synthesized*/ fun Sub(/*0*/ function: (kotlin.Long) -> kotlin.Unit): Sub
public/*package*/ /*synthesized*/ fun Super(/*0*/ function: (kotlin.Long) -> kotlin.Unit): Super
public/*package*/ trait Sub : Super {
public/*package*/ interface Sub : Super {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ superName: kotlin.Long): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -18,7 +18,7 @@ internal final class SubSub : Sub {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public/*package*/ trait Super {
public/*package*/ interface Super {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract fun foo(/*0*/ superName: kotlin.Long): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int