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/duplicateJvmSignature/accidentalOverrides/delegatedFunctionOverriddenByProperty.txt
+2 -2
View File
@@ -1,6 +1,6 @@
package
internal trait B {
internal interface B {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal open fun getX(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -16,7 +16,7 @@ internal final class C : D, B {
public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait D {
internal interface D {
internal abstract val x: kotlin.Int
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/duplicateJvmSignature/accidentalOverrides/overridesNothing.txt
+1 -1
View File
@@ -1,6 +1,6 @@
package
internal trait B {
internal interface B {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal open fun getX(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/require.txt
+1 -1
View File
@@ -8,7 +8,7 @@ internal open class C {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait Tr : C {
internal interface Tr : C {
internal final override /*1*/ /*fake_override*/ val x: kotlin.Int
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal open fun getX(): kotlin.Int
compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByProperty.txt
+1 -1
View File
@@ -9,7 +9,7 @@ internal final class C : T {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait T {
internal interface T {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal open fun getX(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByPropertyInTrait.txt
+2 -2
View File
@@ -1,6 +1,6 @@
package
internal trait C : T {
internal interface C : T {
internal open val x: kotlin.Int
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal open override /*1*/ /*fake_override*/ fun getX(): kotlin.Int
@@ -8,7 +8,7 @@ internal trait C : T {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait T {
internal interface T {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal open fun getX(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByPropertyNoImpl.txt
+1 -1
View File
@@ -9,7 +9,7 @@ internal abstract class C : T {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait T {
internal interface T {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal abstract fun getX(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunction.txt
+1 -1
View File
@@ -9,7 +9,7 @@ internal final class C : T {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait T {
internal interface T {
internal open val x: kotlin.Int
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/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunctionInTrait.txt
+2 -2
View File
@@ -1,6 +1,6 @@
package
internal trait C : T {
internal interface C : T {
internal open override /*1*/ /*fake_override*/ val x: kotlin.Int
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal open fun getX(): kotlin.Int
@@ -8,7 +8,7 @@ internal trait C : T {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait T {
internal interface T {
internal open val x: kotlin.Int
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/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunctionNoImpl.txt
+1 -1
View File
@@ -9,7 +9,7 @@ internal abstract class C : T {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait T {
internal interface T {
internal abstract val x: kotlin.Int
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/duplicateJvmSignature/bridges/fakeOverrideTrait.txt
+1 -1
View File
@@ -1,6 +1,6 @@
package
internal trait B</*0*/ T> {
internal interface B</*0*/ T> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal open fun foo(/*0*/ t: T): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/tests/duplicateJvmSignature/bridges/trait.txt
+1 -1
View File
@@ -1,6 +1,6 @@
package
internal trait B</*0*/ T> {
internal interface B</*0*/ T> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal open fun foo(/*0*/ t: T): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegateToTwoTraits.txt
+2 -2
View File
@@ -1,6 +1,6 @@
package
internal trait Bar</*0*/ T> {
internal interface Bar</*0*/ T> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal abstract fun foo(/*0*/ l: kotlin.List<T>): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -16,7 +16,7 @@ internal final class Baz : Foo<kotlin.String>, Bar<kotlin.Int> {
public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait Foo</*0*/ T> {
internal interface Foo</*0*/ T> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal abstract fun foo(/*0*/ l: kotlin.List<T>): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegationAndOwnMethod.txt
+1 -1
View File
@@ -9,7 +9,7 @@ internal final class Bar : Foo<kotlin.String> {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait Foo</*0*/ T> {
internal interface Foo</*0*/ T> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal abstract fun foo(/*0*/ l: kotlin.List<T>): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegationToTraitImplAndOwnMethod.txt
+1 -1
View File
@@ -17,7 +17,7 @@ internal final class BarOther : Foo<kotlin.String> {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait Foo</*0*/ T> {
internal interface Foo</*0*/ T> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal open fun foo(/*0*/ l: kotlin.List<T>): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/inheritFromTwoTraits.txt
+2 -2
View File
@@ -1,6 +1,6 @@
package
internal trait Bar</*0*/ T> {
internal interface Bar</*0*/ T> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal open fun foo(/*0*/ l: kotlin.List<T>): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -16,7 +16,7 @@ internal final class Baz : Foo<kotlin.String>, Bar<kotlin.Int> {
public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait Foo</*0*/ T> {
internal interface Foo</*0*/ T> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal open fun foo(/*0*/ l: kotlin.List<T>): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/superTraitAndDelegationToTraitImpl.txt
+2 -2
View File
@@ -1,13 +1,13 @@
package
internal trait A</*0*/ T> {
internal interface A</*0*/ T> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal abstract fun foo(/*0*/ l: kotlin.List<T>): kotlin.Unit
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
internal open fun foo(/*0*/ l: kotlin.List<kotlin.Int>): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/twoTraitsAndOwnFunction.txt
+2 -2
View File
@@ -1,6 +1,6 @@
package
internal trait Bar</*0*/ T> {
internal interface Bar</*0*/ T> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal open fun foo(/*0*/ l: kotlin.List<T>): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -17,7 +17,7 @@ internal final class Baz : Foo<kotlin.String>, Bar<kotlin.Int> {
public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait Foo</*0*/ T> {
internal interface Foo</*0*/ T> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal open fun foo(/*0*/ l: kotlin.List<T>): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithBound.txt
+1 -1
View File
@@ -3,7 +3,7 @@ package
internal fun foo(/*0*/ x: Foo): Foo
internal fun </*0*/ T : Foo> foo(/*0*/ x: T): T
internal trait Foo {
internal interface Foo {
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/duplicateJvmSignature/erasure/typeParameterWithTwoBounds.txt
+2 -2
View File
@@ -4,13 +4,13 @@ internal fun foo(/*0*/ x: Bar): Bar
internal fun foo(/*0*/ x: Foo): Foo
internal fun </*0*/ T : Foo> foo(/*0*/ x: T): T where T : Bar
internal trait Bar {
internal interface Bar {
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 Foo {
internal interface Foo {
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/duplicateJvmSignature/erasure/typeParameterWithTwoBoundsInWhere.txt
+2 -2
View File
@@ -4,13 +4,13 @@ internal fun foo(/*0*/ x: Bar): Bar
internal fun foo(/*0*/ x: Foo): Foo
internal fun </*0*/ T : Foo> foo(/*0*/ x: T): T where T : Bar
internal trait Bar {
internal interface Bar {
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 Foo {
internal interface Foo {
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/duplicateJvmSignature/functionAndProperty/trait.txt
+1 -1
View File
@@ -1,6 +1,6 @@
package
internal trait T {
internal interface T {
internal open val x: kotlin.Int
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal open fun getX(): kotlin.Int
compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/withErrorTypes.txt
+1 -1
View File
@@ -1,6 +1,6 @@
package
internal trait T {
internal interface T {
internal abstract val x: [ERROR : ErrorType]
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal abstract fun getX(): [ERROR : ErrorType1]
compiler/testData/diagnostics/tests/duplicateJvmSignature/missingNames.txt
+2 -2
View File
@@ -12,7 +12,7 @@ internal final class <no name provided> {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait <no name provided> {
internal interface <no name provided> {
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
@@ -61,7 +61,7 @@ internal final class Outer {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait <no name provided> {
internal interface <no name provided> {
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/duplicateJvmSignature/specialNames/delegationBy.txt
+1 -1
View File
@@ -8,7 +8,7 @@ internal final class Bar : Foo {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait Foo {
internal interface Foo {
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/duplicateJvmSignature/traitImpl/oneTrait.txt
+1 -1
View File
@@ -9,7 +9,7 @@ internal final class C : T {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait T {
internal interface T {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal open fun getX(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl/twoTraits.txt
+2 -2
View File
@@ -9,14 +9,14 @@ internal final class C : T1, T2 {
public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait T1 {
internal interface T1 {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal open fun getX(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait T2 {
internal interface T2 {
internal open val x: kotlin.Int
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int