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/extensions/ExtensionsCalledOnSuper.txt
+1 -1
View File
@@ -15,7 +15,7 @@ internal final class C : T {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait T {
internal interface T {
internal open fun buzz(): kotlin.Unit
internal open fun buzz1(/*0*/ i: kotlin.Int): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
compiler/testData/diagnostics/tests/extensions/GenericIterator.txt
+1 -1
View File
@@ -4,7 +4,7 @@ internal fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
internal fun </*0*/ T : kotlin.Any> T?.iterator(): MyIterator<T>
internal fun </*0*/ T> java.util.Enumeration<T>.iterator(): kotlin.Iterator<T>
internal trait MyIterator</*0*/ T> {
internal interface MyIterator</*0*/ T> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal abstract fun hasNext(): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/tests/extensions/classObject.txt
+1 -1
View File
@@ -35,7 +35,7 @@ internal final class B {
}
}
internal trait Tr {
internal interface Tr {
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/extensions/extensionMemberInClassObject.txt
+1 -1
View File
@@ -18,7 +18,7 @@ internal final class Foo {
}
}
internal trait JPAEntityClass</*0*/ D> {
internal interface JPAEntityClass</*0*/ 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/extensions/kt1875.txt
+1 -1
View File
@@ -5,7 +5,7 @@ package kt1875 {
internal fun test(/*0*/ t: kt1875.T): kotlin.Unit
internal fun test1(/*0*/ t: kt1875.T?): kotlin.Unit
internal trait T {
internal interface T {
internal abstract val f: ((kotlin.Int) -> kotlin.Unit)?
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/extensions/throwOutCandidatesByReceiver.txt
+1 -1
View File
@@ -15,7 +15,7 @@ package bar {
internal fun kotlin.Int.foo(): kotlin.Unit
internal fun </*0*/ R : kotlin.Any> R?.sure(): R
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