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/smartCasts/combineWithNoSelectorInfo.txt
+1 -1
View File
@@ -3,7 +3,7 @@ package
package foo {
internal fun dispatch(/*0*/ request: foo.Request): kotlin.Unit
internal trait Request {
internal interface Request {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal abstract fun getMethod(): kotlin.String?
internal abstract fun getRequestURI(): kotlin.String?
compiler/testData/diagnostics/tests/smartCasts/inference/intersectionTypes.txt
+3 -3
View File
@@ -11,19 +11,19 @@ package a {
internal fun </*0*/ T> two(/*0*/ u: T, /*1*/ v: T): T
internal fun use(/*0*/ vararg a: kotlin.Any /*kotlin.Array<out kotlin.Any>*/): kotlin.Array<out kotlin.Any>
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 : a.A {
internal interface B : a.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 C : a.A {
internal interface C : a.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/smartCasts/inference/kt4009.txt
+2 -2
View File
@@ -3,7 +3,7 @@ package
internal fun foo1(/*0*/ e: PsiElement): kotlin.Unit
internal fun println(/*0*/ any: kotlin.Any?): kotlin.Nothing
internal trait JetExpression : PsiElement {
internal interface JetExpression : PsiElement {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal abstract override /*1*/ /*fake_override*/ fun getParent(): PsiElement
internal abstract override /*1*/ /*fake_override*/ fun getText(): kotlin.String
@@ -11,7 +11,7 @@ internal trait JetExpression : PsiElement {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait PsiElement {
internal interface PsiElement {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal abstract fun getParent(): PsiElement
internal abstract fun getText(): kotlin.String
compiler/testData/diagnostics/tests/smartCasts/inference/kt4403.txt
+2 -2
View File
@@ -3,13 +3,13 @@ package
internal fun test(/*0*/ a: A): kotlin.Unit
internal fun </*0*/ T> T.f(): T
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 : A {
internal interface B : 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/smartCasts/inference/kt4415.txt
+1 -1
View File
@@ -11,7 +11,7 @@ internal object A {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait SelfJson {
internal interface SelfJson {
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/smartCasts/inference/smartCastOnReceiver.txt
+2 -2
View File
@@ -2,13 +2,13 @@ package
internal fun </*0*/ A, /*1*/ B> A.to(/*0*/ that: B): Pair<A, B>
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/smartCasts/kt3572.txt
+1 -1
View File
@@ -18,7 +18,7 @@ internal final class OKPrinter : Printer {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait Printer {
internal interface Printer {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
internal abstract fun print(): kotlin.Unit
compiler/testData/diagnostics/tests/smartCasts/publicVals/kt4409.txt
+1 -1
View File
@@ -1,6 +1,6 @@
package
public trait A {
public interface A {
public abstract val x: kotlin.Any
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/smartCasts/variables/kt7599.txt
+1 -1
View File
@@ -2,7 +2,7 @@ package
internal fun foo(): kotlin.Boolean
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
internal abstract fun ok(): kotlin.Boolean