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/variance/Class.txt
+13 -13
View File
@@ -1,18 +1,18 @@
package
internal trait In</*0*/ in T> {
internal interface In</*0*/ in T> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait Inv</*0*/ T> {
internal interface Inv</*0*/ T> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait Out</*0*/ out T> {
internal interface Out</*0*/ out T> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
@@ -67,61 +67,61 @@ internal final class SubClass7</*0*/ in I, /*1*/ out O, /*2*/ P> : Inv<I> {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait TypeBounds1</*0*/ in I, /*1*/ out O, /*2*/ P, /*3*/ X : I> {
internal interface TypeBounds1</*0*/ in I, /*1*/ out O, /*2*/ P, /*3*/ X : I> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait TypeBounds2</*0*/ in I, /*1*/ out O, /*2*/ P, /*3*/ X : O> {
internal interface TypeBounds2</*0*/ in I, /*1*/ out O, /*2*/ P, /*3*/ X : O> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait TypeBounds3</*0*/ in I, /*1*/ out O, /*2*/ P, /*3*/ X : P> {
internal interface TypeBounds3</*0*/ in I, /*1*/ out O, /*2*/ P, /*3*/ X : P> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait TypeBounds4</*0*/ in I, /*1*/ out O, /*2*/ P, /*3*/ X : In<I>> {
internal interface TypeBounds4</*0*/ in I, /*1*/ out O, /*2*/ P, /*3*/ X : In<I>> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait TypeBounds5</*0*/ in I, /*1*/ out O, /*2*/ P, /*3*/ X : In<O>> {
internal interface TypeBounds5</*0*/ in I, /*1*/ out O, /*2*/ P, /*3*/ X : In<O>> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait WhereTypeBounds1</*0*/ in I, /*1*/ out O, /*2*/ P, /*3*/ X : I> {
internal interface WhereTypeBounds1</*0*/ in I, /*1*/ out O, /*2*/ P, /*3*/ X : I> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait WhereTypeBounds2</*0*/ in I, /*1*/ out O, /*2*/ P, /*3*/ X : O> {
internal interface WhereTypeBounds2</*0*/ in I, /*1*/ out O, /*2*/ P, /*3*/ X : O> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait WhereTypeBounds3</*0*/ in I, /*1*/ out O, /*2*/ P, /*3*/ X : P> {
internal interface WhereTypeBounds3</*0*/ in I, /*1*/ out O, /*2*/ P, /*3*/ X : P> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait WhereTypeBounds4</*0*/ in I, /*1*/ out O, /*2*/ P, /*3*/ X : In<I>> {
internal interface WhereTypeBounds4</*0*/ in I, /*1*/ out O, /*2*/ P, /*3*/ X : In<I>> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait WhereTypeBounds5</*0*/ in I, /*1*/ out O, /*2*/ P, /*3*/ X : In<O>> {
internal interface WhereTypeBounds5</*0*/ in I, /*1*/ out O, /*2*/ P, /*3*/ X : In<O>> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
compiler/testData/diagnostics/tests/variance/Function.txt
+4 -4
View File
@@ -2,25 +2,25 @@ package
internal fun </*0*/ T> getT(): T
internal trait In</*0*/ in T> {
internal interface In</*0*/ in T> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait Inv</*0*/ T> {
internal interface Inv</*0*/ T> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait Out</*0*/ out T> {
internal interface Out</*0*/ out T> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait Test</*0*/ in I, /*1*/ out O, /*2*/ P> {
internal interface Test</*0*/ in I, /*1*/ out O, /*2*/ P> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal abstract fun explicitReturnType1(): I
internal abstract fun explicitReturnType2(): O
compiler/testData/diagnostics/tests/variance/FunctionTypes.txt
+2 -2
View File
@@ -2,13 +2,13 @@ package
internal fun </*0*/ T> getT(): T
internal trait In</*0*/ in T> {
internal interface In</*0*/ in T> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait Test</*0*/ in I, /*1*/ out O, /*2*/ P> {
internal interface Test</*0*/ in I, /*1*/ out O, /*2*/ P> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
internal abstract fun neOk1(/*0*/ i: (I) -> O): (O) -> I
compiler/testData/diagnostics/tests/variance/InPosition.txt
+5 -5
View File
@@ -1,30 +1,30 @@
package
internal trait In</*0*/ in T> {
internal interface In</*0*/ in T> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait Inv</*0*/ T> {
internal interface Inv</*0*/ T> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait Out</*0*/ out T> {
internal interface Out</*0*/ out T> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait Pair</*0*/ out X, /*1*/ out Y> {
internal interface Pair</*0*/ out X, /*1*/ out Y> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait Test</*0*/ in I, /*1*/ out O, /*2*/ P> {
internal interface Test</*0*/ in I, /*1*/ out O, /*2*/ P> {
internal abstract fun Ok10(/*0*/ i: I): kotlin.Unit
internal abstract fun Ok11(/*0*/ i: In<O>): kotlin.Unit
internal abstract fun Ok12(/*0*/ i: In<In<I>>): kotlin.Unit
compiler/testData/diagnostics/tests/variance/InvariantPosition.txt
+5 -5
View File
@@ -1,30 +1,30 @@
package
internal trait In</*0*/ in T> {
internal interface In</*0*/ in T> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait Inv</*0*/ T> {
internal interface Inv</*0*/ T> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait Out</*0*/ out T> {
internal interface Out</*0*/ out T> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait Pair</*0*/ out X, /*1*/ out Y> {
internal interface Pair</*0*/ out X, /*1*/ out Y> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait Test</*0*/ in I, /*1*/ out O, /*2*/ P> {
internal interface Test</*0*/ in I, /*1*/ out O, /*2*/ P> {
internal abstract var neOk1: O
internal abstract var neOk10: In<out I>
internal abstract var neOk11: I
compiler/testData/diagnostics/tests/variance/NullableTypes.txt
+4 -4
View File
@@ -2,25 +2,25 @@ package
internal fun </*0*/ T> getT(): T
internal trait In</*0*/ in I> {
internal interface In</*0*/ in I> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait Inv</*0*/ P> {
internal interface Inv</*0*/ P> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait Out</*0*/ out O> {
internal interface Out</*0*/ out O> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait Test</*0*/ in I : kotlin.Any, /*1*/ out O : kotlin.Any, /*2*/ P : kotlin.Any> {
internal interface Test</*0*/ in I : kotlin.Any, /*1*/ out O : kotlin.Any, /*2*/ P : kotlin.Any> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
internal abstract fun neOk(/*0*/ i: Out<O?>?): In<O?>?
compiler/testData/diagnostics/tests/variance/OutPosition.txt
+5 -5
View File
@@ -1,30 +1,30 @@
package
internal trait In</*0*/ in T> {
internal interface In</*0*/ in T> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait Inv</*0*/ T> {
internal interface Inv</*0*/ T> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait Out</*0*/ out T> {
internal interface Out</*0*/ out T> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait Pair</*0*/ out X, /*1*/ out Y> {
internal interface Pair</*0*/ out X, /*1*/ out Y> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait Test</*0*/ in I, /*1*/ out O, /*2*/ P> {
internal interface Test</*0*/ in I, /*1*/ out O, /*2*/ P> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
internal abstract fun neOk1(): I
compiler/testData/diagnostics/tests/variance/PrimaryConstructor.txt
+3 -3
View File
@@ -2,19 +2,19 @@ package
internal fun </*0*/ T> getT(): T
internal trait In</*0*/ in T> {
internal interface In</*0*/ in T> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait Inv</*0*/ T> {
internal interface Inv</*0*/ T> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait Out</*0*/ out T> {
internal interface Out</*0*/ out T> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
compiler/testData/diagnostics/tests/variance/ValProperty.txt
+3 -3
View File
@@ -11,19 +11,19 @@ internal final class Delegate</*0*/ T> {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait In</*0*/ in T> {
internal interface In</*0*/ in T> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait Inv</*0*/ T> {
internal interface Inv</*0*/ T> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait Out</*0*/ out T> {
internal interface Out</*0*/ out T> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
compiler/testData/diagnostics/tests/variance/VarProperty.txt
+3 -3
View File
@@ -11,19 +11,19 @@ internal final class Delegate</*0*/ T> {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait In</*0*/ in T> {
internal interface In</*0*/ in T> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait Inv</*0*/ T> {
internal interface Inv</*0*/ T> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait Out</*0*/ out T> {
internal interface Out</*0*/ out T> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
compiler/testData/diagnostics/tests/variance/Visibility.txt
+1 -1
View File
@@ -1,6 +1,6 @@
package
internal trait Test</*0*/ in I, /*1*/ out O> {
internal interface Test</*0*/ in I, /*1*/ out O> {
internal abstract var interlan_private_set: O
internal abstract val internal_val: I
private/*private to this*/ abstract var private_private_set: O
compiler/testData/diagnostics/tests/variance/privateToThis/Trait.txt
+2 -2
View File
@@ -1,6 +1,6 @@
package
package
internal trait Test</*0*/ in I> {
internal interface Test</*0*/ in I> {
private/*private to this*/ final val i: I
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
private/*private to this*/ final fun foo(): I