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/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/ChangeProjectionKind1.txt
+3 -3
View File
@@ -1,13 +1,13 @@
package test
public trait ChangeProjectionKind1 {
public interface ChangeProjectionKind1 {
public trait Sub : test.ChangeProjectionKind1.Super {
public interface Sub : test.ChangeProjectionKind1.Super {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ p: kotlin.MutableList<in kotlin.String>): kotlin.Unit
}
public trait Super {
public interface Super {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(/*0*/ p: kotlin.MutableList<in kotlin.String>): kotlin.Unit
}
compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/ChangeProjectionKind2.txt
+3 -3
View File
@@ -1,13 +1,13 @@
package test
public trait ChangeProjectionKind2 {
public interface ChangeProjectionKind2 {
public trait Sub : test.ChangeProjectionKind2.Super {
public interface Sub : test.ChangeProjectionKind2.Super {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ p: kotlin.MutableList<kotlin.String>): kotlin.Unit
}
public trait Super {
public interface Super {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(/*0*/ p: kotlin.MutableList<kotlin.String>): kotlin.Unit
}
compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter.txt
+4 -4
View File
@@ -1,18 +1,18 @@
package test
public trait DeeplySubstitutedClassParameter {
public interface DeeplySubstitutedClassParameter {
public trait Middle</*0*/ E> : test.DeeplySubstitutedClassParameter.Super<E> {
public interface Middle</*0*/ E> : test.DeeplySubstitutedClassParameter.Super<E> {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ t: E): kotlin.Unit
}
public trait Sub : test.DeeplySubstitutedClassParameter.Middle<kotlin.String> {
public interface Sub : test.DeeplySubstitutedClassParameter.Middle<kotlin.String> {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ t: kotlin.String): kotlin.Unit
}
public trait Super</*0*/ T> {
public interface Super</*0*/ T> {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(/*0*/ t: T): kotlin.Unit
}
compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter2.txt
+4 -4
View File
@@ -1,18 +1,18 @@
package test
public trait DeeplySubstitutedClassParameter2 {
public interface DeeplySubstitutedClassParameter2 {
public trait Middle</*0*/ E> : test.DeeplySubstitutedClassParameter2.Super<E> {
public interface Middle</*0*/ E> : test.DeeplySubstitutedClassParameter2.Super<E> {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ t: E): kotlin.Unit
}
public trait Sub : test.DeeplySubstitutedClassParameter2.Middle<kotlin.String> {
public interface Sub : test.DeeplySubstitutedClassParameter2.Middle<kotlin.String> {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ t: kotlin.String): kotlin.Unit
}
public trait Super</*0*/ T> {
public interface Super</*0*/ T> {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(/*0*/ t: T): kotlin.Unit
}
compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritMutability.txt
+3 -3
View File
@@ -1,13 +1,13 @@
package test
public trait InheritMutability {
public interface InheritMutability {
public trait Sub : test.InheritMutability.Super {
public interface Sub : test.InheritMutability.Super {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ p: kotlin.MutableList<kotlin.String>): kotlin.Unit
}
public trait Super {
public interface Super {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(/*0*/ p: kotlin.MutableList<kotlin.String>): kotlin.Unit
}
compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVararg.txt
+3 -3
View File
@@ -1,13 +1,13 @@
package test
public trait InheritNotVararg {
public interface InheritNotVararg {
public trait Sub : test.InheritNotVararg.Super {
public interface Sub : test.InheritNotVararg.Super {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ p0: kotlin.Array<out kotlin.String>?): kotlin.Unit
}
public trait Super {
public interface Super {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(/*0*/ p0: kotlin.Array<out kotlin.String>?): kotlin.Unit
}
compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVarargInteger.txt
+3 -3
View File
@@ -1,13 +1,13 @@
package test
public trait InheritNotVarargInteger {
public interface InheritNotVarargInteger {
public trait Sub : test.InheritNotVarargInteger.Super {
public interface Sub : test.InheritNotVarargInteger.Super {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ p0: kotlin.Array<out kotlin.Int>?): kotlin.Unit
}
public trait Super {
public interface Super {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(/*0*/ p0: kotlin.Array<out kotlin.Int>?): kotlin.Unit
}
compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVarargNotNull.txt
+3 -3
View File
@@ -1,13 +1,13 @@
package test
public trait InheritNotVarargNotNull {
public interface InheritNotVarargNotNull {
public trait Sub : test.InheritNotVarargNotNull.Super {
public interface Sub : test.InheritNotVarargNotNull.Super {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ p: kotlin.Array<out kotlin.String>): kotlin.Unit
}
public trait Super {
public interface Super {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(/*0*/ p: kotlin.Array<out kotlin.String>): kotlin.Unit
}
compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVarargPrimitive.txt
+3 -3
View File
@@ -1,13 +1,13 @@
package test
public trait InheritNotVarargPrimitive {
public interface InheritNotVarargPrimitive {
public trait Sub : test.InheritNotVarargPrimitive.Super {
public interface Sub : test.InheritNotVarargPrimitive.Super {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ p0: kotlin.IntArray?): kotlin.Unit
}
public trait Super {
public interface Super {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(/*0*/ p0: kotlin.IntArray?): kotlin.Unit
}
compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNullability.txt
+3 -3
View File
@@ -1,13 +1,13 @@
package test
public trait InheritNullability {
public interface InheritNullability {
public trait Sub : test.InheritNullability.Super {
public interface Sub : test.InheritNullability.Super {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ p0: kotlin.String): kotlin.Unit
}
public trait Super {
public interface Super {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(/*0*/ p0: kotlin.String): kotlin.Unit
}
compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritProjectionKind.txt
+3 -3
View File
@@ -1,13 +1,13 @@
package test
public trait InheritProjectionKind {
public interface InheritProjectionKind {
public trait Sub : test.InheritProjectionKind.Super {
public interface Sub : test.InheritProjectionKind.Super {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ p: kotlin.MutableList<in kotlin.String>): kotlin.Unit
}
public trait Super {
public interface Super {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(/*0*/ p: kotlin.MutableList<in kotlin.String>): kotlin.Unit
}
compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritReadOnliness.txt
+3 -3
View File
@@ -1,13 +1,13 @@
package test
public trait InheritReadOnliness {
public interface InheritReadOnliness {
public trait Sub : test.InheritReadOnliness.Super {
public interface Sub : test.InheritReadOnliness.Super {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ p: kotlin.List<kotlin.String>): kotlin.Unit
}
public trait Super {
public interface Super {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(/*0*/ p: kotlin.List<kotlin.String>): kotlin.Unit
}
compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVararg.txt
+3 -3
View File
@@ -1,13 +1,13 @@
package test
public trait InheritVararg {
public interface InheritVararg {
public trait Sub : test.InheritVararg.Super {
public interface Sub : test.InheritVararg.Super {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ vararg p0: kotlin.String? /*kotlin.Array<out kotlin.String?>*/): kotlin.Unit
}
public trait Super {
public interface Super {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(/*0*/ vararg p0: kotlin.String? /*kotlin.Array<out kotlin.String?>*/): kotlin.Unit
}
compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVarargInteger.txt
+3 -3
View File
@@ -1,13 +1,13 @@
package test
public trait InheritVarargInteger {
public interface InheritVarargInteger {
public trait Sub : test.InheritVarargInteger.Super {
public interface Sub : test.InheritVarargInteger.Super {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ vararg p0: kotlin.Int? /*kotlin.Array<out kotlin.Int?>*/): kotlin.Unit
}
public trait Super {
public interface Super {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(/*0*/ vararg p0: kotlin.Int? /*kotlin.Array<out kotlin.Int?>*/): kotlin.Unit
}
compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVarargNotNull.txt
+3 -3
View File
@@ -1,13 +1,13 @@
package test
public trait InheritVarargNotNull {
public interface InheritVarargNotNull {
public trait Sub : test.InheritVarargNotNull.Super {
public interface Sub : test.InheritVarargNotNull.Super {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ vararg p: kotlin.String /*kotlin.Array<out kotlin.String>*/): kotlin.Unit
}
public trait Super {
public interface Super {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(/*0*/ vararg p: kotlin.String /*kotlin.Array<out kotlin.String>*/): kotlin.Unit
}
compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVarargPrimitive.txt
+3 -3
View File
@@ -1,13 +1,13 @@
package test
public trait InheritVarargPrimitive {
public interface InheritVarargPrimitive {
public trait Sub : test.InheritVarargPrimitive.Super {
public interface Sub : test.InheritVarargPrimitive.Super {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ vararg p0: kotlin.Int /*kotlin.IntArray*/): kotlin.Unit
}
public trait Super {
public interface Super {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(/*0*/ vararg p0: kotlin.Int /*kotlin.IntArray*/): kotlin.Unit
}
compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/Kt3302.txt
+4 -4
View File
@@ -1,18 +1,18 @@
package test
public trait Kt3302 {
public interface Kt3302 {
public trait BSONObject {
public interface BSONObject {
public abstract fun dummy(): kotlin.Unit
public abstract fun put(/*0*/ p0: kotlin.String, /*1*/ p1: kotlin.Any): kotlin.Any?
}
public trait BasicBSONObject : test.Kt3302.LinkedHashMap<kotlin.String, kotlin.Any>, test.Kt3302.BSONObject {
public interface BasicBSONObject : test.Kt3302.LinkedHashMap<kotlin.String, kotlin.Any>, test.Kt3302.BSONObject {
public abstract override /*2*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*2*/ fun put(/*0*/ key: kotlin.String, /*1*/ value: kotlin.Any): kotlin.Any?
}
public trait LinkedHashMap</*0*/ K, /*1*/ V> {
public interface LinkedHashMap</*0*/ K, /*1*/ V> {
public abstract fun dummy(): kotlin.Unit
public abstract fun put(/*0*/ key: K, /*1*/ value: V): V?
}
compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/MutableToReadOnly.txt
+3 -3
View File
@@ -1,13 +1,13 @@
package test
public trait MutableToReadOnly {
public interface MutableToReadOnly {
public trait Sub : test.MutableToReadOnly.Super {
public interface Sub : test.MutableToReadOnly.Super {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ p: kotlin.MutableList<kotlin.String>): kotlin.Unit
}
public trait Super {
public interface Super {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(/*0*/ p: kotlin.MutableList<kotlin.String>): kotlin.Unit
}
compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/NotNullToNullable.txt
+3 -3
View File
@@ -1,13 +1,13 @@
package test
public trait NotNullToNullable {
public interface NotNullToNullable {
public trait Sub : test.NotNullToNullable.Super {
public interface Sub : test.NotNullToNullable.Super {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ p0: kotlin.String): kotlin.Unit
}
public trait Super {
public interface Super {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(/*0*/ p0: kotlin.String): kotlin.Unit
}
compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/NullableToNotNull.txt
+3 -3
View File
@@ -1,13 +1,13 @@
package test
public trait NullableToNotNull {
public interface NullableToNotNull {
public trait Sub : test.NullableToNotNull.Super {
public interface Sub : test.NullableToNotNull.Super {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ p0: kotlin.String?): kotlin.Unit
}
public trait Super {
public interface Super {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(/*0*/ p0: kotlin.String?): kotlin.Unit
}
compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.txt
+3 -3
View File
@@ -1,13 +1,13 @@
package test
public trait NullableToNotNullKotlinSignature {
public interface NullableToNotNullKotlinSignature {
public trait Sub : test.NullableToNotNullKotlinSignature.Super {
public interface Sub : test.NullableToNotNullKotlinSignature.Super {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ p: kotlin.String?): kotlin.Unit
}
public trait Super {
public interface Super {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(/*0*/ p: kotlin.String?): kotlin.Unit
}
compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/OverrideWithErasedParameter.txt
+3 -3
View File
@@ -1,13 +1,13 @@
package test
public trait OverrideWithErasedParameter {
public interface OverrideWithErasedParameter {
public trait Sub</*0*/ T> : test.OverrideWithErasedParameter.Super<T> {
public interface Sub</*0*/ T> : test.OverrideWithErasedParameter.Super<T> {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ p0: T?): kotlin.Unit
}
public trait Super</*0*/ T> {
public interface Super</*0*/ T> {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(/*0*/ p0: T?): kotlin.Unit
}
compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/ReadOnlyToMutable.txt
+3 -3
View File
@@ -1,13 +1,13 @@
package test
public trait ReadOnlyToMutable {
public interface ReadOnlyToMutable {
public trait Sub : test.ReadOnlyToMutable.Super {
public interface Sub : test.ReadOnlyToMutable.Super {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ p: kotlin.List<kotlin.String>): kotlin.Unit
}
public trait Super {
public interface Super {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(/*0*/ p: kotlin.List<kotlin.String>): kotlin.Unit
}
compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/SubclassFromGenericAndNot.txt
+4 -4
View File
@@ -1,18 +1,18 @@
package test
public trait SubclassFromGenericAndNot {
public interface SubclassFromGenericAndNot {
public trait Generic</*0*/ T> {
public interface Generic</*0*/ T> {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(/*0*/ key: T): kotlin.Unit
}
public trait NonGeneric {
public interface NonGeneric {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(/*0*/ p0: kotlin.String): kotlin.Unit
}
public trait Sub : test.SubclassFromGenericAndNot.NonGeneric, test.SubclassFromGenericAndNot.Generic<kotlin.String> {
public interface Sub : test.SubclassFromGenericAndNot.NonGeneric, test.SubclassFromGenericAndNot.Generic<kotlin.String> {
public abstract override /*2*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*2*/ fun foo(/*0*/ key: kotlin.String): kotlin.Unit
}
compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/SubstitutedClassParameter.txt
+3 -3
View File
@@ -1,13 +1,13 @@
package test
public trait SubstitutedClassParameter {
public interface SubstitutedClassParameter {
public trait Sub : test.SubstitutedClassParameter.Super<kotlin.String> {
public interface Sub : test.SubstitutedClassParameter.Super<kotlin.String> {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ t: kotlin.String): kotlin.Unit
}
public trait Super</*0*/ T> {
public interface Super</*0*/ T> {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(/*0*/ t: T): kotlin.Unit
}
compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/SubstitutedClassParameters.txt
+4 -4
View File
@@ -1,18 +1,18 @@
package test
public trait SubstitutedClassParameters {
public interface SubstitutedClassParameters {
public trait Sub : test.SubstitutedClassParameters.Super1<kotlin.String>, test.SubstitutedClassParameters.Super2<kotlin.String> {
public interface Sub : test.SubstitutedClassParameters.Super1<kotlin.String>, test.SubstitutedClassParameters.Super2<kotlin.String> {
public abstract override /*2*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*2*/ fun foo(/*0*/ t: kotlin.String): kotlin.Unit
}
public trait Super1</*0*/ T> {
public interface Super1</*0*/ T> {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(/*0*/ t: T): kotlin.Unit
}
public trait Super2</*0*/ E> {
public interface Super2</*0*/ E> {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(/*0*/ t: E): kotlin.Unit
}