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

Change default upper bound of Java type parameters to Any!

Browse Source 
#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
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/loadJava/compiledJava/signaturePropagation/ArraysInSubtypes.txt
Vendored
+1 -1
View File
@@ -2,7 +2,7 @@ package test
public interface ArraysInSubtypes {
public interface Sub</*0*/ T> : test.ArraysInSubtypes.Super {
public interface Sub</*0*/ T : kotlin.Any!> : 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!>!
compiler/testData/loadJava/compiledJava/signaturePropagation/MethodTypeParameterErased.txt
Vendored
+1 -1
View File
@@ -2,7 +2,7 @@ package test
public interface MethodTypeParameterErased {
public interface Bug</*0*/ T> {
public interface Bug</*0*/ T : kotlin.Any!> {
public abstract fun </*0*/ RET : test.MethodTypeParameterErased.Bug<T!>!> save(): RET!
}
compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperType.txt
Vendored
+3 -3
View File
@@ -3,13 +3,13 @@ package test
public open class RawSuperType {
public constructor RawSuperType()
public open inner class Derived : test.RawSuperType.Super<kotlin.Any?> {
public open inner class Derived : test.RawSuperType.Super<kotlin.Any!> {
public constructor Derived()
public open override /*1*/ fun dummy(): kotlin.Unit
public open override /*1*/ fun foo(/*0*/ p0: kotlin.Any?): kotlin.Unit
public open override /*1*/ fun foo(/*0*/ p0: kotlin.Any!): kotlin.Unit
}
public interface Super</*0*/ T> {
public interface Super</*0*/ T : kotlin.Any!> {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(/*0*/ p0: T!): kotlin.Unit
}
compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperTypeWithRecursiveBoundMultipleParameters.txt
Vendored
+3 -3
View File
@@ -3,14 +3,14 @@ package test
public open class RawSuperTypeWithRecursiveBoundMultipleParameters {
public constructor RawSuperTypeWithRecursiveBoundMultipleParameters()
public open inner class Derived : test.RawSuperTypeWithRecursiveBoundMultipleParameters.Super<kotlin.Any?, test.RawSuperTypeWithRecursiveBoundMultipleParameters.Super<*, *>!> {
public open inner class Derived : test.RawSuperTypeWithRecursiveBoundMultipleParameters.Super<kotlin.Any!, test.RawSuperTypeWithRecursiveBoundMultipleParameters.Super<*, *>!> {
public constructor Derived()
public open override /*1*/ fun dummy(): kotlin.Unit
public open fun foo(/*0*/ p0: kotlin.Any!, /*1*/ p1: kotlin.Any!): kotlin.Unit
public open override /*1*/ fun foo(/*0*/ p0: kotlin.Any?, /*1*/ p1: test.RawSuperTypeWithRecursiveBoundMultipleParameters.Super<*, *>!): kotlin.Unit
public open override /*1*/ fun foo(/*0*/ p0: kotlin.Any!, /*1*/ p1: test.RawSuperTypeWithRecursiveBoundMultipleParameters.Super<*, *>!): kotlin.Unit
}
public interface Super</*0*/ R, /*1*/ T : test.RawSuperTypeWithRecursiveBoundMultipleParameters.Super<R!, T!>!> {
public interface Super</*0*/ R : kotlin.Any!, /*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
Vendored
+4 -4
View File
@@ -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()