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/loadJava/compiledKotlin/fun/InheritValAndVar.txt
+3 -3
View File
@@ -1,6 +1,6 @@
package test
public trait Sub : test.Super1, test.Super2 {
public interface Sub : test.Super1, test.Super2 {
internal abstract override /*2*/ /*fake_override*/ var x: kotlin.String
internal abstract override /*2*/ /*fake_override*/ fun <get-x>(): kotlin.String
internal abstract override /*1*/ /*fake_override*/ fun <set-x>(/*0*/ <set-?>: kotlin.String): kotlin.Unit
@@ -9,7 +9,7 @@ public trait Sub : test.Super1, test.Super2 {
internal abstract override /*1*/ /*fake_override*/ fun <set-y>(/*0*/ <set-?>: kotlin.String): kotlin.Unit
}
public trait Super1 {
public interface Super1 {
internal abstract val x: kotlin.String
internal abstract fun <get-x>(): kotlin.String
internal abstract var y: kotlin.String
@@ -17,7 +17,7 @@ public trait Super1 {
internal abstract fun <set-y>(/*0*/ <set-?>: kotlin.String): kotlin.Unit
}
public trait Super2 {
public interface Super2 {
internal abstract var x: kotlin.String
internal abstract fun <get-x>(): kotlin.String
internal abstract fun <set-x>(/*0*/ <set-?>: kotlin.String): kotlin.Unit