Change default upper bound of Java type parameters to Any!

#KT-7672 Fixed
This commit is contained in:
Denis Zharkov
2015-07-17 12:11:56 +03:00
parent 0e69ebb288
commit 97af85da9c
119 changed files with 326 additions and 205 deletions
@@ -1,5 +1,5 @@
package test
public open class ClassExtendsTypeParameter</*0*/ T> : T {
public constructor ClassExtendsTypeParameter</*0*/ T>()
public open class ClassExtendsTypeParameter</*0*/ T : kotlin.Any!> : T {
public constructor ClassExtendsTypeParameter</*0*/ T : kotlin.Any!>()
}
@@ -2,8 +2,8 @@ package test
public interface ReturnInnerSubclassOfSupersInner {
public open class Sub</*0*/ B> : test.ReturnInnerSubclassOfSupersInner.Super<B!> {
public constructor Sub</*0*/ B>()
public open class Sub</*0*/ B : kotlin.Any!> : test.ReturnInnerSubclassOfSupersInner.Super<B!> {
public constructor Sub</*0*/ B : kotlin.Any!>()
public/*package*/ open inner class Inner : test.ReturnInnerSubclassOfSupersInner.Super.Inner {
public/*package*/ constructor Inner()
@@ -11,8 +11,8 @@ public interface ReturnInnerSubclassOfSupersInner {
}
}
public open class Super</*0*/ A> {
public constructor Super</*0*/ A>()
public open class Super</*0*/ A : kotlin.Any!> {
public constructor Super</*0*/ A : kotlin.Any!>()
public/*package*/ open inner class Inner {
public/*package*/ constructor Inner()
+1 -1
View File
@@ -11,7 +11,7 @@ public interface ReturnNotSubtype {
public abstract override /*1*/ fun t(): java.lang.Void!
}
public interface Super</*0*/ T> {
public interface Super</*0*/ T : kotlin.Any!> {
public abstract fun _void(): kotlin.Unit
public abstract fun array(): kotlin.Array<(out) T!>!
public abstract fun klass(): java.lang.Class<out kotlin.CharSequence!>!
+1 -1
View File
@@ -1,6 +1,6 @@
package test
public interface TypeAnnotations</*0*/ TT> {
public interface TypeAnnotations</*0*/ TT : kotlin.Any!> {
public abstract fun f(/*0*/ p: test.G2<@[test.A()] kotlin.String!, @[test.A()] kotlin.Int!>!): kotlin.Unit
public abstract fun f(/*0*/ p: test.G<@[test.A()] kotlin.String!>!): kotlin.Unit
}
@@ -6,10 +6,10 @@ public interface WrongNumberOfGenericParameters {
public abstract fun t1(): test.WrongNumberOfGenericParameters.Two<*, *>!
public abstract fun z(): test.WrongNumberOfGenericParameters.Zero!
public interface One</*0*/ T> {
public interface One</*0*/ T : kotlin.Any!> {
}
public interface Two</*0*/ P, /*1*/ Q> {
public interface Two</*0*/ P : kotlin.Any!, /*1*/ Q : kotlin.Any!> {
}
public interface Zero {