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
+2 -2
View File
@@ -56,7 +56,7 @@ public trait TwoUpperBounds<T> where T : Number, T : Any
//public constructor Inner() defined in rendererTest.TheClass.Inner
//internal final class InternalClass defined in rendererTest
//public constructor InternalClass() defined in rendererTest.InternalClass
//internal trait TheTrait defined in rendererTest
//internal interface TheTrait defined in rendererTest
//internal abstract fun abstractFun(): kotlin.Unit defined in rendererTest.TheTrait
//internal companion object : rendererTest.TheClass<kotlin.Int, kotlin.Int> defined in rendererTest.TheTrait
//private constructor Companion() defined in rendererTest.TheTrait.Companion
@@ -65,5 +65,5 @@ public trait TwoUpperBounds<T> where T : Number, T : Any
//public constructor WithReified<reified A, reified out B>() defined in rendererTest.WithReified
//<reified A> defined in rendererTest.WithReified
//<reified out B> defined in rendererTest.WithReified
//public trait TwoUpperBounds<T : kotlin.Number> where T : kotlin.Any defined in rendererTest
//public interface TwoUpperBounds<T : kotlin.Number> where T : kotlin.Any defined in rendererTest
//<T : kotlin.Number & kotlin.Any> defined in rendererTest.TwoUpperBounds
@@ -31,8 +31,8 @@ deprecated("") fun deprecatedFun()
//public fun <out T> withTypeParam(a: kotlin.Array<T>): kotlin.Int defined in rendererTest
//<out T> defined in rendererTest.withTypeParam
//value-parameter val a: kotlin.Array<T> defined in rendererTest.withTypeParam
//internal trait Foo defined in rendererTest
//internal trait Bar defined in rendererTest
//internal interface Foo defined in rendererTest
//internal interface Bar defined in rendererTest
//internal fun <P : rendererTest.Foo> funTypeParameterWithTwoUpperBounds(): kotlin.Int where P : rendererTest.Bar defined in rendererTest
//<P : rendererTest.Foo & rendererTest.Bar> defined in rendererTest.funTypeParameterWithTwoUpperBounds
//kotlin.deprecated internal fun deprecatedFun(): kotlin.Unit defined in rendererTest
@@ -15,7 +15,7 @@ class B : A {
get
}
//internal trait A defined in root package
//internal interface A defined in root package
//internal abstract val v: kotlin.Int defined in A
//public abstract var int: kotlin.Int defined in A
//private abstract fun <set-int>(<set-?>: kotlin.Int): kotlin.Unit defined in A
@@ -20,7 +20,7 @@ val NOT_IS = 3
//internal final annotation class `true` : kotlin.Annotation defined in root package
//public constructor `true`() defined in `true`
//internal val `val`: kotlin.Int defined in root package
//`true` internal trait `trait` defined in root package
//`true` internal interface `trait` defined in root package
//internal final class `class`<`in`> defined in root package
//<`in`> defined in `class`
//public constructor `class`<`in`>(p: `in`?) defined in `class`