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
@@ -20,7 +20,7 @@ internal final class ConstructorTypeParamClassObjectTypeConflict</*0*/ test> {
internal companion object Companion {
/*primary*/ private constructor Companion()
internal trait test {
internal interface test {
}
}
}
@@ -4,5 +4,5 @@ internal final class ClassParamReferencesSelf</*0*/ A : test.TraitWithP<A>> {
/*primary*/ public constructor ClassParamReferencesSelf</*0*/ A : test.TraitWithP<A>>()
}
internal trait TraitWithP</*0*/ P> {
internal interface TraitWithP</*0*/ P> {
}
@@ -1,6 +1,6 @@
package test
public trait A</*0*/ T> {
public interface A</*0*/ T> {
internal abstract fun bar(): T
internal open fun foo(): T
}
@@ -5,6 +5,6 @@ internal open class Class : test.Trait {
internal open override /*1*/ /*fake_override*/ fun f(/*0*/ a: kotlin.String): kotlin.Unit
}
internal trait Trait {
internal interface Trait {
internal open fun f(/*0*/ a: kotlin.String): kotlin.Unit
}
@@ -1,6 +1,6 @@
package test
internal trait Aaa</*0*/ P> {
internal interface Aaa</*0*/ P> {
}
internal final class Bbb : test.Aaa<java.util.Random> {
@@ -1,9 +1,9 @@
package test
internal trait Rec</*0*/ R, /*1*/ out T : test.Rec<R, T>> {
internal interface Rec</*0*/ R, /*1*/ out T : test.Rec<R, T>> {
internal abstract fun t(): T
}
internal trait Super {
internal interface Super {
internal open fun foo(/*0*/ p: test.Rec<*, *>): test.Rec<*, *>
}
@@ -1,5 +1,5 @@
package test
public trait SingleAbstractMethod {
public interface SingleAbstractMethod {
internal abstract fun foo(): kotlin.Unit
}
@@ -1,4 +1,4 @@
package test
internal trait Trtrtr {
internal interface Trtrtr {
}
@@ -1,6 +1,6 @@
package test
public trait JavaBeanAbstractGetter {
public interface JavaBeanAbstractGetter {
public abstract fun getBlue(): kotlin.Int
public abstract fun getRed(): kotlin.Int
}