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/sourceJava/ErrorTypes.txt
+3 -3
View File
@@ -1,13 +1,13 @@
package test
public trait ErrorTypes {
public interface ErrorTypes {
public trait Sub : test.ErrorTypes.Super {
public interface Sub : test.ErrorTypes.Super {
public abstract override /*1*/ fun errorTypeInParameter(/*0*/ list: kotlin.(Mutable)List<kotlin.Array<(out) [ERROR : Unresolved java classifier: T]!>!>!): kotlin.Unit
public abstract override /*1*/ fun returnErrorType(): [ERROR : Unresolved java classifier: T]!
}
public trait Super {
public interface Super {
public abstract fun errorTypeInParameter(/*0*/ list: kotlin.(Mutable)List<kotlin.Array<(out) [ERROR : Unresolved java classifier: T]!>!>!): kotlin.Unit
public abstract fun returnErrorType(): [ERROR : Unresolved java classifier: T]!
}
compiler/testData/loadJava/sourceJava/NullInAnnotation.txt
+1 -1
View File
@@ -2,7 +2,7 @@ package test
public /*synthesized*/ fun NullInAnnotation(/*0*/ function: () -> kotlin.Unit): test.NullInAnnotation
public trait NullInAnnotation {
public interface NullInAnnotation {
test.NullInAnnotation.Ann(a = null: kotlin.Nothing?, b = {null}: kotlin.Array<out kotlin.String>) public abstract fun foo(): kotlin.Unit
public final annotation class Ann : kotlin.Annotation {
compiler/testData/loadJava/sourceJava/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/sourceJava/ReturnNotSubtype.txt
+3 -3
View File
@@ -1,8 +1,8 @@
package test
public trait ReturnNotSubtype {
public interface ReturnNotSubtype {
public trait Sub : test.ReturnNotSubtype.Super<kotlin.Boolean!> {
public interface Sub : test.ReturnNotSubtype.Super<kotlin.Boolean!> {
public abstract override /*1*/ fun _void(): kotlin.Boolean
public abstract override /*1*/ fun array(): kotlin.Array<(out) java.lang.Void!>!
public abstract override /*1*/ fun klass(): java.lang.Class<*>!
@@ -11,7 +11,7 @@ public trait ReturnNotSubtype {
public abstract override /*1*/ fun t(): java.lang.Void!
}
public trait Super</*0*/ T> {
public interface Super</*0*/ T> {
public abstract fun _void(): kotlin.Unit
public abstract fun array(): kotlin.Array<(out) T!>!
public abstract fun klass(): java.lang.Class<out kotlin.CharSequence!>!
compiler/testData/loadJava/sourceJava/WrongNumberOfGenericParameters.txt
+4 -4
View File
@@ -1,17 +1,17 @@
package test
public trait WrongNumberOfGenericParameters {
public interface WrongNumberOfGenericParameters {
public abstract fun o0(): test.WrongNumberOfGenericParameters.One<*>!
public abstract fun o2(): test.WrongNumberOfGenericParameters.One<[ERROR : T]>!
public abstract fun t1(): test.WrongNumberOfGenericParameters.Two<*, *>!
public abstract fun z(): test.WrongNumberOfGenericParameters.Zero!
public trait One</*0*/ T> {
public interface One</*0*/ T> {
}
public trait Two</*0*/ P, /*1*/ Q> {
public interface Two</*0*/ P, /*1*/ Q> {
}
public trait Zero {
public interface Zero {
}
}