Don't load Object as a supertype for Java classes

#KT-4890 In Progress
 #KT-5002 Fixed
This commit is contained in:
Alexander Udalov
2014-07-21 17:28:06 +04:00
parent bea740b478
commit a79398fa00
34 changed files with 95 additions and 130 deletions
@@ -1,14 +1,14 @@
package test
public trait ErrorTypes : java.lang.Object {
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 trait Super : java.lang.Object {
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]?
}
@@ -2,9 +2,9 @@ package test
public /*synthesized*/ fun NullInAnnotation(/*0*/ function: () -> kotlin.Unit): test.NullInAnnotation
public trait NullInAnnotation : java.lang.Object {
public trait NullInAnnotation {
test.NullInAnnotation.Ann(a = null: kotlin.Nothing?, b = {null}: kotlin.Array<kotlin.String>) public abstract fun foo(): kotlin.Unit
public final annotation class Ann : kotlin.Annotation {
public constructor Ann(/*0*/ a: kotlin.String, /*1*/ vararg b: kotlin.String /*kotlin.Array<kotlin.String>*/)
public abstract fun a(): kotlin.String
@@ -1,20 +1,20 @@
package test
public trait ReturnInnerSubclassOfSupersInner : java.lang.Object {
public trait ReturnInnerSubclassOfSupersInner {
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 open class Super</*0*/ A> : java.lang.Object {
public open class Super</*0*/ A> {
public constructor Super</*0*/ A>()
public/*package*/ open inner class Inner : java.lang.Object {
public/*package*/ open inner class Inner {
public/*package*/ constructor Inner()
public/*package*/ open fun get(): test.ReturnInnerSubclassOfSupersInner.Super<A>?
}
@@ -1,7 +1,7 @@
package test
public trait ReturnNotSubtype : java.lang.Object {
public trait ReturnNotSubtype {
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>?
@@ -10,8 +10,8 @@ public trait ReturnNotSubtype : java.lang.Object {
public abstract override /*1*/ fun string2(): kotlin.MutableList<kotlin.Boolean>?
public abstract override /*1*/ fun t(): java.lang.Void?
}
public trait Super</*0*/ T> : java.lang.Object {
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?>?
@@ -1,17 +1,17 @@
package test
public trait WrongNumberOfGenericParameters : java.lang.Object {
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 trait One</*0*/ T> : java.lang.Object {
public trait One</*0*/ T> {
}
public trait Two</*0*/ P, /*1*/ Q> : java.lang.Object {
public trait Two</*0*/ P, /*1*/ Q> {
}
public trait Zero : java.lang.Object {
public trait Zero {
}
}