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/constraints/equalityConstraintOnNullableType.txt
+1 -1
View File
@@ -4,7 +4,7 @@ internal fun </*0*/ T> doA(/*0*/ a: A<T>): T
internal fun </*0*/ T> foo(/*0*/ a: A<T>, /*1*/ aN: A<T?>): T
internal fun test(/*0*/ a: A<kotlin.Int>, /*1*/ aN: A<kotlin.Int?>): kotlin.Unit
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/constraints/kt7351ConstraintFromUnitExpectedType.txt
+2 -2
View File
@@ -5,13 +5,13 @@ package kt7351 {
internal fun kt7351.Node.append(/*0*/ block: kt7351.Source<kotlin.Int>.() -> kotlin.Unit): kotlin.Unit
internal fun </*0*/ T, /*1*/ S : kt7351.Source<T>> S.woo(): T
internal trait Node {
internal interface Node {
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 Source</*0*/ T> {
internal interface Source</*0*/ T> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal abstract fun f(): T
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/tests/inference/constraints/notNullConstraintOnNullableType.txt
+3 -3
View File
@@ -6,19 +6,19 @@ internal fun </*0*/ T : kotlin.Any> doOut(/*0*/ o: Out<T?>): T
internal fun </*0*/ T : kotlin.Any> doT(/*0*/ t: T?): T
internal fun test(/*0*/ out: Out<kotlin.Int>, /*1*/ i: In<kotlin.Int>, /*2*/ inv: A<kotlin.Int>): kotlin.Unit
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
}
internal trait In</*0*/ in T> {
internal interface In</*0*/ in 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
}
internal trait Out</*0*/ out T> {
internal interface Out</*0*/ out 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/constraints/subtypeConstraintOnNullableType.txt
+2 -2
View File
@@ -4,13 +4,13 @@ internal fun </*0*/ T> doOut(/*0*/ o: Out<T?>): T
internal fun </*0*/ T> foo(/*0*/ a: A<T>, /*1*/ o: Out<T?>): T
internal fun test(/*0*/ a: A<kotlin.Int>, /*1*/ aN: A<kotlin.Int?>, /*2*/ o: Out<kotlin.Int?>): kotlin.Unit
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
}
internal trait Out</*0*/ out T> {
internal interface Out</*0*/ out 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/constraints/supertypeConstraintOnNullableType.txt
+2 -2
View File
@@ -4,13 +4,13 @@ internal fun </*0*/ T> doIn(/*0*/ i: In<T?>): T
internal fun </*0*/ T> foo(/*0*/ a: A<T>, /*1*/ i: In<T>): T
internal fun test(/*0*/ a: A<kotlin.Int>, /*1*/ aN: A<kotlin.Int?>, /*2*/ i: In<kotlin.Int?>): kotlin.Unit
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
}
internal trait In</*0*/ in T> {
internal interface In</*0*/ in 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/nestedCalls/binaryExpressions.txt
+2 -2
View File
@@ -16,13 +16,13 @@ package h {
internal fun </*0*/ T> h.Z.foo(/*0*/ a: h.A<T>): h.A<T>
internal fun </*0*/ T> h.Z.plus(/*0*/ a: h.A<T>): h.A<T>
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
}
internal trait Z {
internal interface Z {
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/nestedCalls/completeNestedForVariableAsFunctionCall.txt
+1 -1
View File
@@ -20,7 +20,7 @@ package j {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait MyFunc</*0*/ T> {
internal interface MyFunc</*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/nestedCalls/makeNullableIfSafeCall.txt
+2 -2
View File
@@ -7,7 +7,7 @@ package a {
internal fun a.B?.bar(): kotlin.Int
internal fun a.B?.baz(): kotlin.Int?
internal trait A {
internal interface A {
internal abstract val b: a.B
internal abstract val nb: a.B?
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -15,7 +15,7 @@ package a {
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
internal abstract fun foo(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/tests/inference/opposite.txt
+2 -2
View File
@@ -2,13 +2,13 @@ package
package a {
internal trait Persistent {
internal interface Persistent {
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 PersistentFactory</*0*/ T> {
internal interface PersistentFactory</*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/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
compiler/testData/diagnostics/tests/inference/reportingImprovements/NoAmbiguityForDifferentFunctionTypes.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 {
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/typeInferenceExpectedTypeMismatch.txt
+6 -6
View File
@@ -9,37 +9,37 @@ package typeInferenceExpectedTypeMismatch {
internal fun test2(/*0*/ outA: typeInferenceExpectedTypeMismatch.Out<typeInferenceExpectedTypeMismatch.A>, /*1*/ inC: typeInferenceExpectedTypeMismatch.In<typeInferenceExpectedTypeMismatch.C>): kotlin.Unit
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 : typeInferenceExpectedTypeMismatch.A {
internal interface B : typeInferenceExpectedTypeMismatch.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 : typeInferenceExpectedTypeMismatch.A {
internal interface C : typeInferenceExpectedTypeMismatch.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 In</*0*/ in T> {
internal interface In</*0*/ in 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
}
internal trait Out</*0*/ out T> {
internal interface Out</*0*/ out 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
}
internal trait Two</*0*/ T, /*1*/ R> {
internal interface Two</*0*/ T, /*1*/ R> {
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/upperBounds/doNotInferFromBoundsOnly.txt
+1 -1
View File
@@ -19,7 +19,7 @@ package a {
internal fun test7(/*0*/ list: kotlin.MutableList<kotlin.Int>): kotlin.Unit
internal fun test8(): kotlin.Int
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
compiler/testData/diagnostics/tests/inference/upperBounds/intersectUpperBounds.txt
+4 -4
View File
@@ -7,25 +7,25 @@ package s {
internal fun test(/*0*/ inA: s.In<s.A>, /*1*/ inB: s.In<s.B>, /*2*/ inC: s.In<s.C>): kotlin.Unit
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 {
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
}
internal trait C : s.A, s.B {
internal interface C : s.A, s.B {
public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait In</*0*/ in T> {
internal interface In</*0*/ in 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/upperBounds/nonNullUpperBound.txt
+1 -1
View File
@@ -5,7 +5,7 @@ internal fun </*0*/ T : A> fooA(/*0*/ v: kotlin.Any): T?
internal fun </*0*/ R : kotlin.Any> unescape(/*0*/ value: kotlin.Any): R?
internal fun </*0*/ R : A> unescapeA(/*0*/ value: kotlin.Any): 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