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

Massive test data update for compiledJava

Browse Source
This commit is contained in:
Andrey Breslav
2014-09-10 19:05:21 +04:00
parent 0b6a4df4f4
commit ea3215b361
249 changed files with 574 additions and 573 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/loadJava/compiledJava/signaturePropagation/ArraysInSubtypes.txt
+1 -1
View File
@@ -13,4 +13,4 @@ public trait ArraysInSubtypes {
public abstract fun listOfArray(): (kotlin.MutableList<out kotlin.Array<(out) kotlin.CharSequence!>!>..kotlin.List<kotlin.Array<(out) kotlin.CharSequence!>!>?)
public abstract fun objArray(): kotlin.Array<(out) kotlin.Any!>!
}
}
}
compiler/testData/loadJava/compiledJava/signaturePropagation/MethodTypeParameterErased.txt
+1 -1
View File
@@ -10,4 +10,4 @@ public trait MethodTypeParameterErased {
public constructor SubBug()
public open fun save(): test.MethodTypeParameterErased.SubBug!
}
}
}
compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperType.txt
+5 -5
View File
@@ -2,16 +2,16 @@ package test
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> {
public abstract fun foo(/*0*/ p0: T!): kotlin.Unit
}
// Static members
public /*synthesized*/ fun </*0*/ T> Super(/*0*/ function: (T!) -> kotlin.Unit): test.RawSuperType.Super<T>
}
public final /*synthesized*/ fun </*0*/ T> Super(/*0*/ function: (T!) -> kotlin.Unit): test.RawSuperType.Super<T>
}
compiler/testData/loadJava/compiledJava/signaturePropagation/ReturnInnerSubclassOfSupersInner.txt
+1 -1
View File
@@ -19,4 +19,4 @@ public trait ReturnInnerSubclassOfSupersInner {
public/*package*/ open fun get(): test.ReturnInnerSubclassOfSupersInner.Super<A!>!
}
}
}
}
compiler/testData/loadJava/compiledJava/signaturePropagation/SubclassWithRawType.txt
+17 -17
View File
@@ -3,24 +3,24 @@ package test
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>>?
public abstract override /*1*/ fun boundWildcard1(): kotlin.MutableList<out kotlin.List<kotlin.String?>?>?
public abstract override /*1*/ fun boundWildcard2(): kotlin.MutableList<in kotlin.List<kotlin.Any>?>?
public abstract override /*1*/ fun simple1(): kotlin.MutableList<out kotlin.String?>?
public abstract override /*1*/ fun simple2(): kotlin.MutableList<out kotlin.List<kotlin.String>?>?
public abstract override /*1*/ fun simple3(): kotlin.MutableList<out kotlin.Any>?
public abstract override /*1*/ fun wildcard(): kotlin.MutableList<out kotlin.Any?>?
public abstract override /*1*/ fun array1(): kotlin.Array<(out) kotlin.(Mutable)List<kotlin.String!>!>!
public abstract override /*1*/ fun array2(): kotlin.Array<(out) (kotlin.MutableList<out kotlin.Any?>..kotlin.List<kotlin.Any?>?)>!
public abstract override /*1*/ fun boundWildcard1(): (kotlin.MutableList<out kotlin.(Mutable)List<kotlin.String!>!>..kotlin.List<kotlin.(Mutable)List<kotlin.String!>!>?)
public abstract override /*1*/ fun boundWildcard2(): kotlin.(Mutable)List<in (kotlin.MutableList<out kotlin.Any?>..kotlin.List<kotlin.Any?>?)>!
public abstract override /*1*/ fun simple1(): kotlin.(Mutable)List<kotlin.String!>!
public abstract override /*1*/ fun simple2(): kotlin.(Mutable)List<kotlin.(Mutable)List<kotlin.String!>!>!
public abstract override /*1*/ fun simple3(): (kotlin.MutableList<out kotlin.Any?>..kotlin.List<kotlin.Any?>?)
public abstract override /*1*/ fun wildcard(): (kotlin.MutableList<out kotlin.Any?>..kotlin.List<kotlin.Any?>?)
}
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?>?>?
public abstract fun boundWildcard2(): kotlin.MutableList<in kotlin.List<kotlin.String>?>?
public abstract fun simple1(): kotlin.MutableList<out kotlin.Any?>?
public abstract fun simple2(): kotlin.MutableList<out kotlin.Any?>?
public abstract fun simple3(): kotlin.MutableList<kotlin.String>?
public abstract fun wildcard(): kotlin.MutableList<out kotlin.Any?>?
public abstract fun array1(): kotlin.Array<(out) (kotlin.MutableList<out kotlin.Any?>..kotlin.List<kotlin.Any?>?)>!
public abstract fun array2(): kotlin.Array<(out) kotlin.(Mutable)List<kotlin.String!>!>!
public abstract fun boundWildcard1(): (kotlin.MutableList<out (kotlin.MutableList<out kotlin.Any?>..kotlin.List<kotlin.Any?>?)>..kotlin.List<(kotlin.MutableList<out kotlin.Any?>..kotlin.List<kotlin.Any?>?)>?)
public abstract fun boundWildcard2(): kotlin.(Mutable)List<in kotlin.(Mutable)List<kotlin.String!>!>!
public abstract fun simple1(): (kotlin.MutableList<out kotlin.Any?>..kotlin.List<kotlin.Any?>?)
public abstract fun simple2(): (kotlin.MutableList<out kotlin.Any?>..kotlin.List<kotlin.Any?>?)
public abstract fun simple3(): kotlin.(Mutable)List<kotlin.String!>!
public abstract fun wildcard(): (kotlin.MutableList<out kotlin.Any?>..kotlin.List<kotlin.Any?>?)
}
}
}
compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesInconsistentGenericTypes.txt
+4 -4
View File
@@ -8,12 +8,12 @@ public trait TwoSuperclassesInconsistentGenericTypes {
public trait Other {
public abstract fun foo(): kotlin.(Mutable)List<kotlin.String!>!
}
public open class Sub : test.TwoSuperclassesInconsistentGenericTypes, test.TwoSuperclassesInconsistentGenericTypes.Other {
public constructor Sub()
public open override /*2*/ fun foo(): kotlin.(Mutable)List<kotlin.String!>!
}
// Static members
public /*synthesized*/ fun Other(/*0*/ function: () -> kotlin.(Mutable)List<kotlin.String!>!): test.TwoSuperclassesInconsistentGenericTypes.Other
}
public final /*synthesized*/ fun Other(/*0*/ function: () -> kotlin.(Mutable)List<kotlin.String!>!): test.TwoSuperclassesInconsistentGenericTypes.Other
}
compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesVarargAndNot.txt
+9 -9
View File
@@ -1,20 +1,20 @@
package test
public trait TwoSuperclassesVarargAndNot {
public trait Sub : test.TwoSuperclassesVarargAndNot.Super1, test.TwoSuperclassesVarargAndNot.Super2 {
public abstract override /*2*/ fun foo(/*0*/ p0: kotlin.Array<(out) kotlin.String!>!): kotlin.Unit
public abstract override /*2*/ fun foo(/*0*/ s: kotlin.Array<(out) kotlin.String!>!): kotlin.Unit
}
public trait Super1 {
public abstract fun foo(/*0*/ vararg p0: kotlin.String! /*kotlin.Array<(out) kotlin.String!>!*/): kotlin.Unit
}
public trait Super2 {
public abstract fun foo(/*0*/ p0: kotlin.Array<(out) kotlin.String!>!): kotlin.Unit
public abstract fun foo(/*0*/ s: kotlin.Array<(out) kotlin.String!>!): kotlin.Unit
}
// Static members
public /*synthesized*/ fun Super1(/*0*/ function: (kotlin.Array<(out) kotlin.String!>!) -> kotlin.Unit): test.TwoSuperclassesVarargAndNot.Super1
public /*synthesized*/ fun Super2(/*0*/ function: (kotlin.Array<(out) kotlin.String!>!) -> kotlin.Unit): test.TwoSuperclassesVarargAndNot.Super2
}
public final /*synthesized*/ fun Super1(/*0*/ function: (kotlin.Array<(out) kotlin.String!>!) -> kotlin.Unit): test.TwoSuperclassesVarargAndNot.Super1
public final /*synthesized*/ fun Super2(/*0*/ function: (kotlin.Array<(out) kotlin.String!>!) -> kotlin.Unit): test.TwoSuperclassesVarargAndNot.Super2
}