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

Fix testData in compiler: add collections and ranges package to fq-names.

Browse Source
This commit is contained in:
Ilya Gorbunov
2015-11-28 01:42:20 +03:00
parent 98e2d27c77
commit f4822cd757
524 changed files with 1594 additions and 1552 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/loadJava/compiledJava/signaturePropagation/ArraysInSubtypes.txt
Vendored
+2 -2
View File
@@ -4,13 +4,13 @@ public interface ArraysInSubtypes {
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 listOfArray(): (kotlin.collections.MutableList<out kotlin.Array<(out) kotlin.String!>!>..kotlin.collections.List<kotlin.Array<(out) kotlin.String!>!>?)
public abstract override /*1*/ fun objArray(): kotlin.Array<(out) T!>!
}
public interface Super {
public abstract fun array(): kotlin.Array<(out) kotlin.CharSequence!>!
public abstract fun listOfArray(): (kotlin.MutableList<out kotlin.Array<(out) kotlin.CharSequence!>!>..kotlin.List<kotlin.Array<(out) kotlin.CharSequence!>!>?)
public abstract fun listOfArray(): (kotlin.collections.MutableList<out kotlin.Array<(out) kotlin.CharSequence!>!>..kotlin.collections.List<kotlin.Array<(out) kotlin.CharSequence!>!>?)
public abstract fun objArray(): kotlin.Array<(out) kotlin.Any!>!
}
}
compiler/testData/loadJava/compiledJava/signaturePropagation/SubclassWithRawType.txt
Vendored
+16 -16
View File
@@ -3,24 +3,24 @@ package test
public interface SubclassWithRawType {
public interface Sub : test.SubclassWithRawType.Super {
public abstract override /*1*/ fun array1(): kotlin.Array<(out) kotlin.(Mutable)List<kotlin.String!>!>!
public abstract override /*1*/ fun array2(): kotlin.Array<(out) kotlin.(Mutable)List<(raw) 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.(Mutable)List<(raw) 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.(Mutable)List<(raw) kotlin.Any?>!
public abstract override /*1*/ fun wildcard(): kotlin.(Mutable)List<(raw) kotlin.Any?>!
public abstract override /*1*/ fun array1(): kotlin.Array<(out) kotlin.collections.(Mutable)List<kotlin.String!>!>!
public abstract override /*1*/ fun array2(): kotlin.Array<(out) kotlin.collections.(Mutable)List<(raw) kotlin.Any?>!>!
public abstract override /*1*/ fun boundWildcard1(): (kotlin.collections.MutableList<out kotlin.collections.(Mutable)List<kotlin.String!>!>..kotlin.collections.List<kotlin.collections.(Mutable)List<kotlin.String!>!>?)
public abstract override /*1*/ fun boundWildcard2(): kotlin.collections.(Mutable)List<in kotlin.collections.(Mutable)List<(raw) kotlin.Any?>!>!
public abstract override /*1*/ fun simple1(): kotlin.collections.(Mutable)List<kotlin.String!>!
public abstract override /*1*/ fun simple2(): kotlin.collections.(Mutable)List<kotlin.collections.(Mutable)List<kotlin.String!>!>!
public abstract override /*1*/ fun simple3(): kotlin.collections.(Mutable)List<(raw) kotlin.Any?>!
public abstract override /*1*/ fun wildcard(): kotlin.collections.(Mutable)List<(raw) kotlin.Any?>!
}
public interface Super {
public abstract fun array1(): kotlin.Array<(out) kotlin.(Mutable)List<(raw) kotlin.Any?>!>!
public abstract fun array2(): kotlin.Array<(out) kotlin.(Mutable)List<kotlin.String!>!>!
public abstract fun boundWildcard1(): (kotlin.MutableList<out kotlin.(Mutable)List<(raw) kotlin.Any?>!>..kotlin.List<kotlin.(Mutable)List<(raw) kotlin.Any?>!>?)
public abstract fun boundWildcard2(): kotlin.(Mutable)List<in kotlin.(Mutable)List<kotlin.String!>!>!
public abstract fun simple1(): kotlin.(Mutable)List<(raw) kotlin.Any?>!
public abstract fun simple2(): kotlin.(Mutable)List<(raw) kotlin.Any?>!
public abstract fun simple3(): kotlin.(Mutable)List<kotlin.String!>!
public abstract fun wildcard(): kotlin.(Mutable)List<*>!
public abstract fun array1(): kotlin.Array<(out) kotlin.collections.(Mutable)List<(raw) kotlin.Any?>!>!
public abstract fun array2(): kotlin.Array<(out) kotlin.collections.(Mutable)List<kotlin.String!>!>!
public abstract fun boundWildcard1(): (kotlin.collections.MutableList<out kotlin.collections.(Mutable)List<(raw) kotlin.Any?>!>..kotlin.collections.List<kotlin.collections.(Mutable)List<(raw) kotlin.Any?>!>?)
public abstract fun boundWildcard2(): kotlin.collections.(Mutable)List<in kotlin.collections.(Mutable)List<kotlin.String!>!>!
public abstract fun simple1(): kotlin.collections.(Mutable)List<(raw) kotlin.Any?>!
public abstract fun simple2(): kotlin.collections.(Mutable)List<(raw) kotlin.Any?>!
public abstract fun simple3(): kotlin.collections.(Mutable)List<kotlin.String!>!
public abstract fun wildcard(): kotlin.collections.(Mutable)List<*>!
}
}
compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesInconsistentGenericTypes.txt
Vendored
+3 -3
View File
@@ -2,16 +2,16 @@ package test
public interface TwoSuperclassesInconsistentGenericTypes {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(): kotlin.(Mutable)List<kotlin.String!>!
public abstract fun foo(): kotlin.collections.(Mutable)List<kotlin.String!>!
public interface Other {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(): kotlin.(Mutable)List<kotlin.String!>!
public abstract fun foo(): kotlin.collections.(Mutable)List<kotlin.String!>!
}
public open class Sub : test.TwoSuperclassesInconsistentGenericTypes, test.TwoSuperclassesInconsistentGenericTypes.Other {
public constructor Sub()
public open override /*2*/ fun dummy(): kotlin.Unit
public open override /*2*/ fun foo(): kotlin.(Mutable)List<kotlin.String!>!
public open override /*2*/ fun foo(): kotlin.collections.(Mutable)List<kotlin.String!>!
}
}