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