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/declarationChecks/FunctionWithMissingNames.txt
+3 -3
View File
@@ -1,4 +1,4 @@
package
package
a() internal fun <no name provided>(): kotlin.Unit
internal fun <no name provided>(): kotlin.Unit
@@ -6,13 +6,13 @@ internal fun outerFun(): kotlin.Unit
internal fun A.<no name provided>(): kotlin.Unit
internal fun [a()] A.<no name provided>(): 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
}
internal trait B {
internal interface 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/declarationChecks/ambiguousObjectExpressionType.txt
+1 -1
View File
@@ -54,7 +54,7 @@ internal open class MyClass {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait MyTrait {
internal interface MyTrait {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal open fun f1(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/tests/declarationChecks/illegalModifiersOnClass.txt
+1 -1
View File
@@ -77,7 +77,7 @@ internal open enum class C : kotlin.Enum<C> {
public final /*synthesized*/ fun values(): kotlin.Array<C>
}
internal trait D {
internal interface D {
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/declarationChecks/kt1141.txt
+1 -1
View File
@@ -20,7 +20,7 @@ package kt1141 {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public trait SomeTrait {
public interface SomeTrait {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal abstract fun foo(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/tests/declarationChecks/kt2397.txt
+1 -1
View File
@@ -10,7 +10,7 @@ package a {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait T {
internal interface T {
internal final val b: kotlin.Int
internal final val c: kotlin.Int
internal final val d: kotlin.Int = 1