azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Test data fixed

Browse Source
This commit is contained in:
Andrey Breslav
2014-06-30 17:14:34 +04:00
parent 195274370f
commit 0cbbb6a0db
72 changed files with 219 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/loadJava/sourceJava/ErrorTypes.txt
+5 -5
View File
@@ -3,13 +3,13 @@ package test
public trait ErrorTypes {
public trait Sub : test.ErrorTypes.Super {
public abstract fun errorTypeInParameter(/*0*/ list: kotlin.List<kotlin.Array<[ERROR : Unresolved java classifier: T]>?>?): kotlin.Unit
public abstract override /*1*/ /*fake_override*/ fun errorTypeInParameter(/*0*/ list: kotlin.List<kotlin.Array<[ERROR : Unresolved java classifier: T]>?>?): kotlin.Unit
public abstract override /*1*/ fun returnErrorType(): [ERROR : Unresolved java classifier: T]?
public abstract fun errorTypeInParameter(/*0*/ list: kotlin.(Mutable)List<kotlin.Array<(out) [ERROR : Unresolved java classifier: T]!>!>!): kotlin.Unit
public abstract override /*1*/ /*fake_override*/ 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 abstract fun errorTypeInParameter(/*0*/ list: kotlin.List<kotlin.Array<[ERROR : Unresolved java classifier: T]>?>?): kotlin.Unit
public abstract fun returnErrorType(): [ERROR : Unresolved java classifier: T]?
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/ReturnInnerSubclassOfSupersInner.txt
+3 -3
View File
@@ -2,12 +2,12 @@ package test
public trait ReturnInnerSubclassOfSupersInner {
public open class Sub</*0*/ B> : test.ReturnInnerSubclassOfSupersInner.Super<B> {
public open class Sub</*0*/ B> : test.ReturnInnerSubclassOfSupersInner.Super<B!> {
public constructor Sub</*0*/ B>()
public/*package*/ open inner class Inner : test.ReturnInnerSubclassOfSupersInner.Super.Inner {
public/*package*/ constructor Inner()
public/*package*/ open override /*1*/ fun get(): test.ReturnInnerSubclassOfSupersInner.Sub<B>?
public/*package*/ open override /*1*/ fun get(): test.ReturnInnerSubclassOfSupersInner.Sub<B!>!
}
}
@@ -16,7 +16,7 @@ public trait ReturnInnerSubclassOfSupersInner {
public/*package*/ open inner class Inner {
public/*package*/ constructor Inner()
public/*package*/ open fun get(): test.ReturnInnerSubclassOfSupersInner.Super<A>?
public/*package*/ open fun get(): test.ReturnInnerSubclassOfSupersInner.Super<A!>!
}
}
}
compiler/testData/loadJava/sourceJava/ReturnNotSubtype.txt
+10 -10
View File
@@ -2,21 +2,21 @@ package test
public trait ReturnNotSubtype {
public trait Sub : test.ReturnNotSubtype.Super<kotlin.Boolean> {
public trait Sub : test.ReturnNotSubtype.Super<kotlin.Boolean!> {
public abstract override /*1*/ fun _void(): kotlin.Boolean
public abstract override /*1*/ fun array(): kotlin.Array<java.lang.Void>?
public abstract override /*1*/ fun klass(): java.lang.Class<out kotlin.Any?>?
public abstract override /*1*/ fun array(): kotlin.Array<(out) java.lang.Void!>!
public abstract override /*1*/ fun klass(): java.lang.Class<out kotlin.Any?>!
public abstract override /*1*/ fun string1(): kotlin.Unit
public abstract override /*1*/ fun string2(): kotlin.MutableList<kotlin.Boolean>?
public abstract override /*1*/ fun t(): java.lang.Void?
public abstract override /*1*/ fun string2(): kotlin.(Mutable)List<kotlin.Boolean!>!
public abstract override /*1*/ fun t(): java.lang.Void!
}
public trait Super</*0*/ T> {
public abstract fun _void(): kotlin.Unit
public abstract fun array(): kotlin.Array<T>?
public abstract fun klass(): java.lang.Class<out kotlin.CharSequence?>?
public abstract fun string1(): kotlin.String?
public abstract fun string2(): kotlin.String?
public abstract fun t(): T?
public abstract fun array(): kotlin.Array<(out) T!>!
public abstract fun klass(): java.lang.Class<out kotlin.CharSequence!>!
public abstract fun string1(): kotlin.String!
public abstract fun string2(): kotlin.String!
public abstract fun t(): T!
}
}
compiler/testData/loadJava/sourceJava/WrongNumberOfGenericParameters.txt
+4 -4
View File
@@ -1,10 +1,10 @@
package test
public trait WrongNumberOfGenericParameters {
public abstract fun o0(): test.WrongNumberOfGenericParameters.One<out kotlin.Any?>?
public abstract fun o2(): test.WrongNumberOfGenericParameters.One<[ERROR : T]>?
public abstract fun t1(): test.WrongNumberOfGenericParameters.Two<out kotlin.Any?, out kotlin.Any?>?
public abstract fun z(): test.WrongNumberOfGenericParameters.Zero?
public abstract fun o0(): test.WrongNumberOfGenericParameters.One<out kotlin.Any?>!
public abstract fun o2(): test.WrongNumberOfGenericParameters.One<[ERROR : T]>!
public abstract fun t1(): test.WrongNumberOfGenericParameters.Two<out kotlin.Any?, out kotlin.Any?>!
public abstract fun z(): test.WrongNumberOfGenericParameters.Zero!
public trait One</*0*/ T> {
}