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/generics/argumentsForT.txt
+1 -1
View File
@@ -3,7 +3,7 @@ package
internal fun </*0*/ T> foo(/*0*/ t: T): kotlin.Unit
internal fun </*0*/ T> foo1(/*0*/ t: T): kotlin.Unit
internal trait A {
internal interface 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
compiler/testData/diagnostics/tests/generics/recursive.txt
+1 -1
View File
@@ -16,7 +16,7 @@ internal final class B : Rec<B> {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait Rec</*0*/ T> {
internal interface Rec</*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/generics/resolveGenericBoundsBeforeSupertypes.txt
+1 -1
View File
@@ -7,7 +7,7 @@ internal object O : Tr<V<*>> {
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/generics/varProjection/setterNotProjectedOutAssign.txt
+1 -1
View File
@@ -2,7 +2,7 @@ package
internal fun test(/*0*/ t: Tr<*>): kotlin.Unit
internal trait Tr</*0*/ T> {
internal interface Tr</*0*/ T> {
internal abstract var v: 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
compiler/testData/diagnostics/tests/generics/varProjection/setterProjectedOutAssign.txt
+1 -1
View File
@@ -2,7 +2,7 @@ package
internal fun test(/*0*/ t: Tr<*>): kotlin.Unit
internal trait Tr</*0*/ T> {
internal interface Tr</*0*/ T> {
internal abstract var v: 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
compiler/testData/diagnostics/tests/generics/varProjection/setterProjectedOutNoPlusAssign.txt
+1 -1
View File
@@ -2,7 +2,7 @@ package
internal fun test(/*0*/ t: Tr<out kotlin.String>): kotlin.Unit
internal trait Tr</*0*/ T> {
internal interface Tr</*0*/ T> {
internal abstract var v: 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
compiler/testData/diagnostics/tests/generics/varProjection/setterProjectedOutPlusAssignDefined.txt
+1 -1
View File
@@ -10,7 +10,7 @@ internal final class C {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait Tr</*0*/ T> {
internal interface Tr</*0*/ T> {
internal abstract var v: 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