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/delegatedProperty/delegatedPropertyOverridedInTrait.txt
+1 -1
View File
@@ -2,7 +2,7 @@ package
internal fun foo(): kotlin.Unit
internal trait A {
internal interface A {
internal abstract val prop: kotlin.Int
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/delegatedProperty/delegatedPropertyOverridedInTraitTypeMismatch.txt
+1 -1
View File
@@ -2,7 +2,7 @@ package
internal fun foo(): kotlin.Unit
internal trait A {
internal interface A {
internal abstract val prop: kotlin.Int
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/delegatedProperty/inTrait.txt
+1 -1
View File
@@ -8,7 +8,7 @@ internal final class Delegate {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait T {
internal interface T {
internal open val a: kotlin.Int
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/delegatedProperty/inference/differentDelegatedExpressions.txt
+2 -2
View File
@@ -32,7 +32,7 @@ package baz {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait MyPropertyContainer {
internal interface MyPropertyContainer {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal abstract fun </*0*/ R, /*1*/ T> getMyProperty(): baz.MyProperty<R, T>
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -47,7 +47,7 @@ package baz {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait Outer {
internal interface Outer {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal abstract fun getContainer(): baz.MyPropertyContainer
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int