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/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter.txt
Vendored
+2 -2
View File
@@ -2,7 +2,7 @@ package test
public interface DeeplySubstitutedClassParameter {
public interface Middle</*0*/ E> : test.DeeplySubstitutedClassParameter.Super<E!> {
public interface Middle</*0*/ E : kotlin.Any!> : test.DeeplySubstitutedClassParameter.Super<E!> {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ t: E!): kotlin.Unit
}
@@ -12,7 +12,7 @@ public interface DeeplySubstitutedClassParameter {
public abstract override /*1*/ fun foo(/*0*/ t: kotlin.String!): 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*/ t: T!): kotlin.Unit
}
compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter2.txt
Vendored
+2 -2
View File
@@ -2,7 +2,7 @@ package test
public interface DeeplySubstitutedClassParameter2 {
public interface Middle</*0*/ E> : test.DeeplySubstitutedClassParameter2.Super<E!> {
public interface Middle</*0*/ E : kotlin.Any!> : test.DeeplySubstitutedClassParameter2.Super<E!> {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ t: E!): kotlin.Unit
}
@@ -12,7 +12,7 @@ public interface DeeplySubstitutedClassParameter2 {
public abstract override /*1*/ fun foo(/*0*/ t: kotlin.String!): 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*/ t: T!): kotlin.Unit
}
compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/Kt3302.txt
Vendored
+1 -1
View File
@@ -12,7 +12,7 @@ public interface Kt3302 {
public abstract override /*2*/ fun put(/*0*/ key: kotlin.String, /*1*/ value: kotlin.Any): kotlin.Any!
}
public interface LinkedHashMap</*0*/ K, /*1*/ V> {
public interface LinkedHashMap</*0*/ K : kotlin.Any!, /*1*/ V : kotlin.Any!> {
public abstract fun dummy(): kotlin.Unit
public abstract fun put(/*0*/ key: K!, /*1*/ value: V!): V!
}
compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/OverrideWithErasedParameter.txt
Vendored
+2 -2
View File
@@ -2,13 +2,13 @@ package test
public interface OverrideWithErasedParameter {
public interface Sub</*0*/ T> : test.OverrideWithErasedParameter.Super<T!> {
public interface Sub</*0*/ T : kotlin.Any!> : test.OverrideWithErasedParameter.Super<T!> {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: T!): kotlin.Unit
public abstract 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/kotlinSignature/propagation/parameter/SubclassFromGenericAndNot.txt
Vendored
+1 -1
View File
@@ -2,7 +2,7 @@ package test
public interface SubclassFromGenericAndNot {
public interface Generic</*0*/ T> {
public interface Generic</*0*/ T : kotlin.Any!> {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(/*0*/ key: T!): kotlin.Unit
}
compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubstitutedClassParameter.txt
Vendored
+1 -1
View File
@@ -7,7 +7,7 @@ public interface SubstitutedClassParameter {
public abstract override /*1*/ fun foo(/*0*/ t: kotlin.String!): 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*/ t: T!): kotlin.Unit
}
compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubstitutedClassParameters.txt
Vendored
+2 -2
View File
@@ -7,12 +7,12 @@ public interface SubstitutedClassParameters {
public abstract override /*2*/ fun foo(/*0*/ t: kotlin.String!): kotlin.Unit
}
public interface Super1</*0*/ T> {
public interface Super1</*0*/ T : kotlin.Any!> {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(/*0*/ t: T!): kotlin.Unit
}
public interface Super2</*0*/ E> {
public interface Super2</*0*/ E : kotlin.Any!> {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(/*0*/ t: E!): kotlin.Unit
}