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

Remove Object from supertypes in LoadJava testData

Browse Source
This commit is contained in:
Alexander Udalov
2014-07-21 17:30:31 +04:00
parent a79398fa00
commit 5dc37217c8
402 changed files with 961 additions and 961 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/loadJava/compiledJava/signaturePropagation/ArraysInSubtypes.txt
+4 -4
View File
@@ -1,14 +1,14 @@
package test
public trait ArraysInSubtypes : java.lang.Object {
public trait ArraysInSubtypes {
public trait Sub</*0*/ T> : test.ArraysInSubtypes.Super {
public abstract override /*1*/ fun array(): kotlin.Array<kotlin.String>?
public abstract override /*1*/ fun listOfArray(): kotlin.MutableList<out kotlin.Array<kotlin.String>?>?
public abstract override /*1*/ fun objArray(): kotlin.Array<T>?
}
public trait Super : java.lang.Object {
public trait Super {
public abstract fun array(): kotlin.Array<kotlin.CharSequence>?
public abstract fun listOfArray(): kotlin.MutableList<out kotlin.Array<kotlin.CharSequence>?>?
public abstract fun objArray(): kotlin.Array<kotlin.Any>?
compiler/testData/loadJava/compiledJava/signaturePropagation/MethodTypeParameterErased.txt
+4 -4
View File
@@ -1,11 +1,11 @@
package test
public trait MethodTypeParameterErased : java.lang.Object {
public trait Bug</*0*/ T> : java.lang.Object {
public trait MethodTypeParameterErased {
public trait Bug</*0*/ T> {
public abstract fun </*0*/ RET : test.MethodTypeParameterErased.Bug<T>?> save(): RET?
}
public open class SubBug : test.MethodTypeParameterErased.Bug<kotlin.Any> {
public constructor SubBug()
public open fun save(): test.MethodTypeParameterErased.SubBug?
compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperType.txt
+4 -4
View File
@@ -1,14 +1,14 @@
package test
public open class RawSuperType : java.lang.Object {
public open class RawSuperType {
public constructor RawSuperType()
public open inner class Derived : test.RawSuperType.Super<kotlin.Any?> {
public constructor Derived()
public open override /*1*/ fun foo(/*0*/ p0: kotlin.Any?): kotlin.Unit
}
public trait Super</*0*/ T> : java.lang.Object {
public trait Super</*0*/ T> {
public abstract fun foo(/*0*/ p0: T?): kotlin.Unit
}
}
compiler/testData/loadJava/compiledJava/signaturePropagation/ReturnInnerSubclassOfSupersInner.txt
+7 -7
View File
@@ -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>?
}
compiler/testData/loadJava/compiledJava/signaturePropagation/SubclassWithRawType.txt
+4 -4
View File
@@ -1,7 +1,7 @@
package test
public trait SubclassWithRawType : java.lang.Object {
public trait SubclassWithRawType {
public trait Sub : test.SubclassWithRawType.Super {
public abstract override /*1*/ fun array1(): kotlin.Array<kotlin.List<kotlin.String?>>?
public abstract override /*1*/ fun array2(): kotlin.Array<kotlin.List<kotlin.Any>>?
@@ -12,8 +12,8 @@ public trait SubclassWithRawType : java.lang.Object {
public abstract override /*1*/ fun simple3(): kotlin.MutableList<out kotlin.Any>?
public abstract override /*1*/ fun wildcard(): kotlin.MutableList<out kotlin.Any?>?
}
public trait Super : java.lang.Object {
public trait Super {
public abstract fun array1(): kotlin.Array<kotlin.List<kotlin.Any?>>?
public abstract fun array2(): kotlin.Array<kotlin.List<kotlin.String>>?
public abstract fun boundWildcard1(): kotlin.MutableList<out kotlin.List<kotlin.Any?>?>?
compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesInconsistentGenericTypes.txt
+4 -4
View File
@@ -2,13 +2,13 @@ package test
public /*synthesized*/ fun TwoSuperclassesInconsistentGenericTypes(/*0*/ function: () -> kotlin.MutableList<kotlin.String?>): test.TwoSuperclassesInconsistentGenericTypes
public trait TwoSuperclassesInconsistentGenericTypes : java.lang.Object {
public trait TwoSuperclassesInconsistentGenericTypes {
public abstract fun foo(): kotlin.MutableList<kotlin.String?>
public trait Other : java.lang.Object {
public trait Other {
public abstract fun foo(): kotlin.MutableList<kotlin.String>?
}
public open class Sub : test.TwoSuperclassesInconsistentGenericTypes, test.TwoSuperclassesInconsistentGenericTypes.Other {
public constructor Sub()
public open override /*2*/ fun foo(): kotlin.MutableList<kotlin.String>
compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesVarargAndNot.txt
+6 -6
View File
@@ -1,17 +1,17 @@
package test
public trait TwoSuperclassesVarargAndNot : java.lang.Object {
public trait TwoSuperclassesVarargAndNot {
public trait Sub : test.TwoSuperclassesVarargAndNot.Super1, test.TwoSuperclassesVarargAndNot.Super2 {
public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ vararg p0: kotlin.String? /*kotlin.Array<kotlin.String?>*/): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ s: kotlin.Array<out kotlin.String?>?): kotlin.Unit
}
public trait Super1 : java.lang.Object {
public trait Super1 {
public abstract fun foo(/*0*/ vararg p0: kotlin.String? /*kotlin.Array<kotlin.String?>*/): kotlin.Unit
}
public trait Super2 : java.lang.Object {
public trait Super2 {
public abstract fun foo(/*0*/ s: kotlin.Array<out kotlin.String?>?): kotlin.Unit
}
}