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/compiledJava/signaturePropagation/ArraysInSubtypes.txt
+3 -3
View File
@@ -1,14 +1,14 @@
package test
public trait ArraysInSubtypes {
public interface ArraysInSubtypes {
public trait Sub</*0*/ T> : test.ArraysInSubtypes.Super {
public interface Sub</*0*/ T> : test.ArraysInSubtypes.Super {
public abstract override /*1*/ fun array(): kotlin.Array<(out) kotlin.String!>!
public abstract override /*1*/ fun listOfArray(): (kotlin.MutableList<out kotlin.Array<(out) kotlin.String!>!>..kotlin.List<kotlin.Array<(out) kotlin.String!>!>?)
public abstract override /*1*/ fun objArray(): kotlin.Array<(out) T!>!
}
public trait Super {
public interface Super {
public abstract fun array(): kotlin.Array<(out) kotlin.CharSequence!>!
public abstract fun listOfArray(): (kotlin.MutableList<out kotlin.Array<(out) kotlin.CharSequence!>!>..kotlin.List<kotlin.Array<(out) kotlin.CharSequence!>!>?)
public abstract fun objArray(): kotlin.Array<(out) kotlin.Any!>!
compiler/testData/loadJava/compiledJava/signaturePropagation/MethodTypeParameterErased.txt
+2 -2
View File
@@ -1,8 +1,8 @@
package test
public trait MethodTypeParameterErased {
public interface MethodTypeParameterErased {
public trait Bug</*0*/ T> {
public interface Bug</*0*/ T> {
public abstract fun </*0*/ RET : test.MethodTypeParameterErased.Bug<T!>!> save(): RET!
}
compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperType.txt
+1 -1
View File
@@ -9,7 +9,7 @@ public open class RawSuperType {
public open override /*1*/ fun foo(/*0*/ p0: kotlin.Any!): 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/compiledJava/signaturePropagation/RawSuperTypeWithBound.txt
+2 -2
View File
@@ -3,7 +3,7 @@ package test
public open class RawSuperTypeWithBound {
public constructor RawSuperTypeWithBound()
public trait Bound {
public interface Bound {
}
public open inner class Derived : test.RawSuperTypeWithBound.Super<test.RawSuperTypeWithBound.Bound!> {
@@ -13,7 +13,7 @@ public open class RawSuperTypeWithBound {
public open override /*1*/ fun foo(/*0*/ p0: test.RawSuperTypeWithBound.Bound!): kotlin.Unit
}
public trait Super</*0*/ T : test.RawSuperTypeWithBound.Bound!> {
public interface Super</*0*/ T : test.RawSuperTypeWithBound.Bound!> {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(/*0*/ p0: T!): kotlin.Unit
}
compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperTypeWithRecursiveBound.txt
+1 -1
View File
@@ -10,7 +10,7 @@ public open class RawSuperTypeWithRecursiveBound {
public open override /*1*/ fun foo(/*0*/ p0: test.RawSuperTypeWithRecursiveBound.Super<*>!): kotlin.Unit
}
public trait Super</*0*/ T : test.RawSuperTypeWithRecursiveBound.Super<T!>!> {
public interface Super</*0*/ T : test.RawSuperTypeWithRecursiveBound.Super<T!>!> {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(/*0*/ p0: T!): kotlin.Unit
}
compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperTypeWithRecursiveBoundMultipleParameters.txt
+1 -1
View File
@@ -10,7 +10,7 @@ public open class RawSuperTypeWithRecursiveBoundMultipleParameters {
public open override /*1*/ fun foo(/*0*/ p0: kotlin.Any!, /*1*/ p1: test.RawSuperTypeWithRecursiveBoundMultipleParameters.Super<*, *>!): kotlin.Unit
}
public trait Super</*0*/ R, /*1*/ T : test.RawSuperTypeWithRecursiveBoundMultipleParameters.Super<R!, T!>!> {
public interface Super</*0*/ R, /*1*/ T : test.RawSuperTypeWithRecursiveBoundMultipleParameters.Super<R!, T!>!> {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(/*0*/ p0: R!, /*1*/ p1: T!): kotlin.Unit
}
compiler/testData/loadJava/compiledJava/signaturePropagation/ReturnInnerSubclassOfSupersInner.txt
+1 -1
View File
@@ -1,6 +1,6 @@
package test
public trait ReturnInnerSubclassOfSupersInner {
public interface ReturnInnerSubclassOfSupersInner {
public open class Sub</*0*/ B> : test.ReturnInnerSubclassOfSupersInner.Super<B!> {
public constructor Sub</*0*/ B>()
compiler/testData/loadJava/compiledJava/signaturePropagation/SubclassWithRawType.txt
+3 -3
View File
@@ -1,8 +1,8 @@
package test
public trait SubclassWithRawType {
public interface SubclassWithRawType {
public trait Sub : test.SubclassWithRawType.Super {
public interface Sub : test.SubclassWithRawType.Super {
public abstract override /*1*/ fun array1(): kotlin.Array<(out) kotlin.(Mutable)List<kotlin.String!>!>!
public abstract override /*1*/ fun array2(): kotlin.Array<(out) kotlin.(Mutable)List<*>!>!
public abstract override /*1*/ fun boundWildcard1(): (kotlin.MutableList<out kotlin.(Mutable)List<kotlin.String!>!>..kotlin.List<kotlin.(Mutable)List<kotlin.String!>!>?)
@@ -13,7 +13,7 @@ public trait SubclassWithRawType {
public abstract override /*1*/ fun wildcard(): kotlin.(Mutable)List<*>!
}
public trait Super {
public interface Super {
public abstract fun array1(): kotlin.Array<(out) kotlin.(Mutable)List<*>!>!
public abstract fun array2(): kotlin.Array<(out) kotlin.(Mutable)List<kotlin.String!>!>!
public abstract fun boundWildcard1(): (kotlin.MutableList<out (kotlin.MutableList<out kotlin.Any?>..kotlin.List<kotlin.Any?>?)>..kotlin.List<(kotlin.MutableList<out kotlin.Any?>..kotlin.List<kotlin.Any?>?)>?)
compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesInconsistentGenericTypes.txt
+2 -2
View File
@@ -1,10 +1,10 @@
package test
public trait TwoSuperclassesInconsistentGenericTypes {
public interface TwoSuperclassesInconsistentGenericTypes {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(): kotlin.(Mutable)List<kotlin.String!>!
public trait Other {
public interface Other {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(): kotlin.(Mutable)List<kotlin.String!>!
}
compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesVarargAndNot.txt
+4 -4
View File
@@ -1,18 +1,18 @@
package test
public trait TwoSuperclassesVarargAndNot {
public interface TwoSuperclassesVarargAndNot {
public trait Sub : test.TwoSuperclassesVarargAndNot.Super1, test.TwoSuperclassesVarargAndNot.Super2 {
public interface Sub : test.TwoSuperclassesVarargAndNot.Super1, test.TwoSuperclassesVarargAndNot.Super2 {
public abstract override /*2*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*2*/ fun foo(/*0*/ s: kotlin.Array<(out) kotlin.String!>!): kotlin.Unit
}
public trait Super1 {
public interface Super1 {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(/*0*/ vararg p0: kotlin.String! /*kotlin.Array<(out) kotlin.String!>!*/): kotlin.Unit
}
public trait Super2 {
public interface Super2 {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(/*0*/ s: kotlin.Array<(out) kotlin.String!>!): kotlin.Unit
}