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/cast/bare/AsNestedBare.txt
+2 -2
View File
@@ -3,13 +3,13 @@ package
internal fun test(/*0*/ tr: Tr): kotlin.Any
internal fun test1(/*0*/ tr: Tr): kotlin.Any
internal trait G</*0*/ T> {
internal interface G</*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 Tr {
internal interface Tr {
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/cast/bare/AsNullable.txt
+2 -2
View File
@@ -2,13 +2,13 @@ package
internal fun test(/*0*/ tr: Tr<kotlin.String>): kotlin.Unit
internal trait G</*0*/ T> : Tr<T> {
internal interface G</*0*/ T> : Tr<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 Tr</*0*/ T> {
internal interface Tr</*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
compiler/testData/diagnostics/tests/cast/bare/AsNullableNotEnough.txt
+2 -2
View File
@@ -2,13 +2,13 @@ package
internal fun test(/*0*/ tr: Tr): kotlin.Unit
internal trait G</*0*/ T> {
internal interface G</*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 Tr {
internal interface Tr {
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/cast/bare/EitherAs.txt
+3 -3
View File
@@ -19,19 +19,19 @@ internal final class C2 {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait Either</*0*/ out A, /*1*/ out B> {
internal interface Either</*0*/ out A, /*1*/ out B> {
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 Left</*0*/ out A> : Either<A, kotlin.Nothing> {
internal interface Left</*0*/ out A> : Either<A, kotlin.Nothing> {
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 Right</*0*/ out B> : Either<kotlin.Nothing, B> {
internal interface Right</*0*/ out B> : Either<kotlin.Nothing, B> {
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/cast/bare/EitherIs.txt
+3 -3
View File
@@ -19,20 +19,20 @@ internal final class C2 {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait Either</*0*/ out A, /*1*/ out B> {
internal interface Either</*0*/ out A, /*1*/ out B> {
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 Left</*0*/ out A> : Either<A, kotlin.Nothing> {
internal interface Left</*0*/ out A> : Either<A, kotlin.Nothing> {
internal abstract val value: A
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 Right</*0*/ out B> : Either<kotlin.Nothing, B> {
internal interface Right</*0*/ out B> : Either<kotlin.Nothing, B> {
internal abstract val value: B
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/tests/cast/bare/EitherNotIs.txt
+3 -3
View File
@@ -19,20 +19,20 @@ internal final class C2 {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait Either</*0*/ out A, /*1*/ out B> {
internal interface Either</*0*/ out A, /*1*/ out B> {
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 Left</*0*/ out A> : Either<A, kotlin.Nothing> {
internal interface Left</*0*/ out A> : Either<A, kotlin.Nothing> {
internal abstract val value: A
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 Right</*0*/ out B> : Either<kotlin.Nothing, B> {
internal interface Right</*0*/ out B> : Either<kotlin.Nothing, B> {
internal abstract val value: B
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/tests/cast/bare/EitherSafeAs.txt
+3 -3
View File
@@ -19,19 +19,19 @@ internal final class C2 {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait Either</*0*/ out A, /*1*/ out B> {
internal interface Either</*0*/ out A, /*1*/ out B> {
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 Left</*0*/ out A> : Either<A, kotlin.Nothing> {
internal interface Left</*0*/ out A> : Either<A, kotlin.Nothing> {
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 Right</*0*/ out B> : Either<kotlin.Nothing, B> {
internal interface Right</*0*/ out B> : Either<kotlin.Nothing, B> {
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/cast/bare/EitherWhen.txt
+3 -3
View File
@@ -18,20 +18,20 @@ internal final class C2 {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait Either</*0*/ out A, /*1*/ out B> {
internal interface Either</*0*/ out A, /*1*/ out B> {
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 Left</*0*/ out A> : Either<A, kotlin.Nothing> {
internal interface Left</*0*/ out A> : Either<A, kotlin.Nothing> {
internal abstract val value: A
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 Right</*0*/ out B> : Either<kotlin.Nothing, B> {
internal interface Right</*0*/ out B> : Either<kotlin.Nothing, B> {
internal abstract val value: B
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/tests/cast/bare/ErrorsInSubstitution.txt
+2 -2
View File
@@ -2,13 +2,13 @@ package
internal fun f(/*0*/ p: B<[ERROR : Foo]>): kotlin.Any
internal trait B</*0*/ T> {
internal interface B</*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 G</*0*/ T> : B<T> {
internal interface G</*0*/ T> : B<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/cast/bare/NullableAs.txt
+2 -2
View File
@@ -2,13 +2,13 @@ package
internal fun test(/*0*/ tr: Tr<kotlin.String>?): kotlin.Unit
internal trait G</*0*/ T> : Tr<T> {
internal interface G</*0*/ T> : Tr<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 Tr</*0*/ T> {
internal interface Tr</*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
compiler/testData/diagnostics/tests/cast/bare/NullableAsNotEnough.txt
+2 -2
View File
@@ -2,13 +2,13 @@ package
internal fun test(/*0*/ tr: Tr?): kotlin.Unit
internal trait G</*0*/ T> {
internal interface G</*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 Tr {
internal interface Tr {
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/cast/bare/NullableAsNullable.txt
+2 -2
View File
@@ -2,13 +2,13 @@ package
internal fun test(/*0*/ tr: Tr<kotlin.String>?): kotlin.Unit
internal trait G</*0*/ T> : Tr<T> {
internal interface G</*0*/ T> : Tr<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 Tr</*0*/ T> {
internal interface Tr</*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
compiler/testData/diagnostics/tests/cast/bare/NullableAsNullableNotEnough.txt
+2 -2
View File
@@ -2,13 +2,13 @@ package
internal fun test(/*0*/ tr: Tr?): kotlin.Unit
internal trait G</*0*/ T> {
internal interface G</*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 Tr {
internal interface Tr {
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/cast/bare/RedundantNullable.txt
+1 -1
View File
@@ -2,7 +2,7 @@ package
internal fun f(/*0*/ b: B<kotlin.String>?): kotlin.Boolean
internal trait B</*0*/ T> {
internal interface B</*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
compiler/testData/diagnostics/tests/cast/bare/UnrelatedAs.txt
+2 -2
View File
@@ -2,13 +2,13 @@ package
internal fun test(/*0*/ tr: Tr): kotlin.Unit
internal trait G</*0*/ T> {
internal interface G</*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 Tr {
internal interface Tr {
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/cast/bare/UnrelatedColon.txt
+2 -2
View File
@@ -2,13 +2,13 @@ package
internal fun test(/*0*/ tr: Tr): [ERROR : G]
internal trait G</*0*/ T> {
internal interface G</*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 Tr {
internal interface Tr {
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/cast/bare/UnrelatedIs.txt
+2 -2
View File
@@ -2,13 +2,13 @@ package
internal fun test(/*0*/ tr: Tr): kotlin.Boolean
internal trait G</*0*/ T> {
internal interface G</*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 Tr {
internal interface Tr {
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