replace 'trait' keyword with 'interface' in user-visible messages and code generation tools

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
@@ -7,10 +7,10 @@ internal final class B : test.X, test.Y {
internal open override /*2*/ fun foo(): kotlin.Unit
}
internal trait X {
internal interface X {
internal abstract fun foo(): kotlin.Unit
}
internal trait Y : test.X {
internal interface Y : test.X {
internal abstract override /*1*/ /*fake_override*/ fun foo(): kotlin.Unit
}
@@ -1,16 +1,16 @@
package test
public trait Sub : test.Super1, test.Super2 {
public interface Sub : test.Super1, test.Super2 {
public abstract override /*1*/ /*fake_override*/ fun bar(): kotlin.CharSequence
public abstract override /*1*/ /*fake_override*/ fun foo(): kotlin.CharSequence
}
public trait Super1 {
public interface Super1 {
private abstract fun bar(): kotlin.String
public abstract fun foo(): kotlin.CharSequence
}
public trait Super2 {
public interface Super2 {
public abstract fun bar(): kotlin.CharSequence
private abstract fun foo(): kotlin.String
}
@@ -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
@@ -1,20 +1,20 @@
package test
public trait Sub : test.Super1, test.Super2 {
public interface Sub : test.Super1, test.Super2 {
internal abstract override /*2*/ /*fake_override*/ val x: kotlin.String
internal abstract override /*2*/ /*fake_override*/ fun <get-x>(): kotlin.String
internal abstract override /*2*/ /*fake_override*/ val y: kotlin.String
internal abstract override /*2*/ /*fake_override*/ fun <get-y>(): kotlin.String
}
public trait Super1 {
public interface Super1 {
internal abstract val x: kotlin.String
internal abstract fun <get-x>(): kotlin.String
internal abstract val y: kotlin.CharSequence
internal abstract fun <get-y>(): kotlin.CharSequence
}
public trait Super2 {
public interface Super2 {
internal abstract val x: kotlin.CharSequence
internal abstract fun <get-x>(): kotlin.CharSequence
internal abstract val y: kotlin.String
@@ -24,7 +24,7 @@ internal final class D : test.B, test.X {
internal open override /*2*/ /*fake_override*/ fun foo(): kotlin.Unit
}
internal trait X : test.A {
internal interface X : test.A {
internal open fun bar(): kotlin.Unit
internal abstract override /*1*/ /*fake_override*/ fun foo(): kotlin.Unit
}
@@ -2,6 +2,6 @@ package test
internal fun foo(/*0*/ r: java.lang.Runnable): kotlin.Unit
public trait TaskObject {
public interface TaskObject {
internal abstract fun foo(/*0*/ r: java.lang.Runnable): kotlin.Unit
}
@@ -1,5 +1,5 @@
package test
public trait Runnable {
public interface Runnable {
internal abstract fun run(): kotlin.Unit
}
@@ -1,6 +1,6 @@
package test
internal trait A {
internal interface A {
internal open fun bar(): kotlin.Unit
internal open fun foo(): kotlin.Unit
}
@@ -2,8 +2,8 @@ package test
internal fun </*0*/ T : test.Foo> foo(): kotlin.Unit where T : test.Bar
internal trait Bar {
internal interface Bar {
}
internal trait Foo {
internal interface Foo {
}