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/controlFlowAnalysis/definiteReturn/ReturnFromFunctionInObject.txt
+1 -1
View File
@@ -2,7 +2,7 @@ package
internal val m: X
internal trait X {
internal interface X {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal abstract fun f(): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/tests/controlFlowAnalysis/definiteReturn/kt4034.txt
+3 -3
View File
@@ -2,19 +2,19 @@ package
private fun transformClassifierType(/*0*/ classifierType: JavaClassifierType, /*1*/ howThisTypeIsUsed: TypeUsage): JetType?
internal trait JavaClassifierType {
internal interface JavaClassifierType {
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 JetType {
internal interface JetType {
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 TypeUsage {
internal interface TypeUsage {
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/controlFlowAnalysis/kt1191.txt
+1 -1
View File
@@ -4,7 +4,7 @@ package kt1191 {
internal fun foo(/*0*/ unused: kotlin.Int): kotlin.Any
internal fun </*0*/ T> kt1191.FunctionalList<T>.plus(/*0*/ element: T): kt1191.FunctionalList<T>
internal trait FunctionalList</*0*/ T> {
internal interface FunctionalList</*0*/ T> {
internal abstract val head: T
internal abstract val size: kotlin.Int
internal abstract val tail: kt1191.FunctionalList<T>
compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2226.txt
+1 -1
View File
@@ -3,7 +3,7 @@ package
package a {
internal fun foo(/*0*/ b: a.B): kotlin.Int
internal trait A {
internal interface A {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal abstract fun foo(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/tests/controlFlowAnalysis/kt3444.txt
+1 -1
View File
@@ -3,7 +3,7 @@ package
internal val m: X
internal fun box(): kotlin.Unit
internal trait X {
internal interface X {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal abstract fun f(): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int