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/inference/regressions/kt2283.txt
+1 -1
View File
@@ -4,7 +4,7 @@ package a {
internal fun foo(): kotlin.Unit
internal fun </*0*/ A, /*1*/ B> a.Foo<A>.map(/*0*/ f: (A) -> B): a.Foo<B>
internal trait Foo</*0*/ A> {
internal interface Foo</*0*/ 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/inference/regressions/kt2320.txt
+2 -2
View File
@@ -4,14 +4,14 @@ package i {
internal fun </*0*/ B, /*1*/ C> i.NotMap<B>.mapValuesOnly(/*0*/ f: (B) -> C): i.NotMap<C>
internal fun </*0*/ V, /*1*/ R> i.NotMap<V>.mapValuesOriginal(/*0*/ ff: (i.Entry<V>) -> R): i.NotMap<R>
internal trait Entry</*0*/ B> {
internal interface Entry</*0*/ B> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal abstract fun getValue(): B
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait NotMap</*0*/ B> {
internal interface NotMap</*0*/ 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/inference/regressions/kt2505.txt
+1 -1
View File
@@ -19,7 +19,7 @@ package a {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait MyType {
internal interface MyType {
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/inference/regressions/kt2841.txt
+1 -1
View File
@@ -11,7 +11,7 @@ package a {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait Closeable {
internal interface Closeable {
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/inference/regressions/kt2841_it.txt
+1 -1
View File
@@ -12,7 +12,7 @@ package a {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait Closeable {
internal interface Closeable {
internal open fun close(): 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/inference/regressions/kt2841_it_this.txt
+1 -1
View File
@@ -12,7 +12,7 @@ package a {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait Closeable {
internal interface Closeable {
internal open fun close(): 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/inference/regressions/kt2841_this.txt
+1 -1
View File
@@ -12,7 +12,7 @@ package a {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait Closeable {
internal interface Closeable {
internal open fun close(): 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/inference/regressions/kt2842.txt
+1 -1
View File
@@ -8,7 +8,7 @@ package c {
internal fun </*0*/ R> c.A<R>.foo(): kotlin.Unit
public fun </*0*/ K, /*1*/ V> kotlin.Map<K, V>.iterator(): kotlin.Iterator<kotlin.Map.Entry<K, V>>
internal trait A</*0*/ T> {
internal interface A</*0*/ T> {
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/inference/regressions/kt3301.txt
+2 -2
View File
@@ -5,13 +5,13 @@ package arrays {
internal fun m(/*0*/ args: kotlin.Array<arrays.A>): kotlin.Unit
internal fun test122(): 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