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/diagnostics/tests/inference/regressions/kt1029.txt
Vendored
+2 -2
View File
@@ -2,6 +2,6 @@ package
package i {
public fun a(): kotlin.Unit
public fun </*0*/ T> from(/*0*/ yielder: () -> kotlin.Iterable<T>): kotlin.Iterable<T>
public infix fun </*0*/ T> kotlin.Iterable<T>.where(/*0*/ predicate: (T) -> kotlin.Boolean): () -> kotlin.Iterable<T>
public fun </*0*/ T> from(/*0*/ yielder: () -> kotlin.collections.Iterable<T>): kotlin.collections.Iterable<T>
public infix fun </*0*/ T> kotlin.collections.Iterable<T>.where(/*0*/ predicate: (T) -> kotlin.Boolean): () -> kotlin.collections.Iterable<T>
}
compiler/testData/diagnostics/tests/inference/regressions/kt1031.txt
Vendored
+2 -2
View File
@@ -2,6 +2,6 @@ package
package i {
public fun a(): kotlin.Unit
public fun </*0*/ TItem, /*1*/ TResult> select(/*0*/ yielder: () -> kotlin.Iterable<TItem>, /*1*/ selector: (TItem) -> TResult): () -> kotlin.Iterable<TResult>
public infix fun </*0*/ TItem> kotlin.Iterable<TItem>.where(/*0*/ predicate: (TItem) -> kotlin.Boolean): () -> kotlin.Iterable<TItem>
public fun </*0*/ TItem, /*1*/ TResult> select(/*0*/ yielder: () -> kotlin.collections.Iterable<TItem>, /*1*/ selector: (TItem) -> TResult): () -> kotlin.collections.Iterable<TResult>
public infix fun </*0*/ TItem> kotlin.collections.Iterable<TItem>.where(/*0*/ predicate: (TItem) -> kotlin.Boolean): () -> kotlin.collections.Iterable<TItem>
}
compiler/testData/diagnostics/tests/inference/regressions/kt1127.txt
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
package
package d {
public fun </*0*/ T> asList(/*0*/ t: T): kotlin.List<T>?
public fun </*0*/ T> asList(/*0*/ t: T): kotlin.collections.List<T>?
public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
}
compiler/testData/diagnostics/tests/inference/regressions/kt1145.txt
Vendored
+3 -3
View File
@@ -1,7 +1,7 @@
package
package d {
public fun test(/*0*/ numbers: kotlin.Iterable<kotlin.Int>): kotlin.Unit
public fun </*0*/ T> kotlin.Iterable<T>.fold(/*0*/ initial: T, /*1*/ operation: (T, T) -> T): T
public fun </*0*/ T, /*1*/ R> kotlin.Iterable<T>.map(/*0*/ transform: (T) -> R): kotlin.List<R>
public fun test(/*0*/ numbers: kotlin.collections.Iterable<kotlin.Int>): kotlin.Unit
public fun </*0*/ T> kotlin.collections.Iterable<T>.fold(/*0*/ initial: T, /*1*/ operation: (T, T) -> T): T
public fun </*0*/ T, /*1*/ R> kotlin.collections.Iterable<T>.map(/*0*/ transform: (T) -> R): kotlin.collections.List<R>
}
compiler/testData/diagnostics/tests/inference/regressions/kt1410.txt
Vendored
+3 -3
View File
@@ -1,8 +1,8 @@
package
package d {
public fun foo(/*0*/ result: kotlin.MutableList<in kotlin.String>, /*1*/ collection: kotlin.MutableCollection<kotlin.String>, /*2*/ prefix: kotlin.String): kotlin.Unit
public fun test(/*0*/ result: kotlin.MutableList<in kotlin.Any>, /*1*/ collection: kotlin.MutableCollection<kotlin.String>, /*2*/ prefix: kotlin.String): kotlin.Unit
public fun </*0*/ T> kotlin.MutableCollection<out T>.filterToMy(/*0*/ result: kotlin.MutableList<in T>, /*1*/ filter: (T) -> kotlin.Boolean): kotlin.MutableCollection<out T>
public fun foo(/*0*/ result: kotlin.collections.MutableList<in kotlin.String>, /*1*/ collection: kotlin.collections.MutableCollection<kotlin.String>, /*2*/ prefix: kotlin.String): kotlin.Unit
public fun test(/*0*/ result: kotlin.collections.MutableList<in kotlin.Any>, /*1*/ collection: kotlin.collections.MutableCollection<kotlin.String>, /*2*/ prefix: kotlin.String): kotlin.Unit
public fun </*0*/ T> kotlin.collections.MutableCollection<out T>.filterToMy(/*0*/ result: kotlin.collections.MutableList<in T>, /*1*/ filter: (T) -> kotlin.Boolean): kotlin.collections.MutableCollection<out T>
public fun kotlin.String.startsWith(/*0*/ prefix: kotlin.String): kotlin.Boolean
}
compiler/testData/diagnostics/tests/inference/regressions/kt1718.txt
Vendored
+1 -1
View File
@@ -3,5 +3,5 @@ package
package n {
public fun </*0*/ T> arrayList(/*0*/ vararg values: T /*kotlin.Array<out T>*/): java.util.ArrayList<T>
public fun test(): kotlin.Unit
public operator fun </*0*/ T> kotlin.Iterable<T>.plus(/*0*/ elements: kotlin.Iterable<T>): kotlin.List<T>
public operator fun </*0*/ T> kotlin.collections.Iterable<T>.plus(/*0*/ elements: kotlin.collections.Iterable<T>): kotlin.collections.List<T>
}
compiler/testData/diagnostics/tests/inference/regressions/kt2057.txt
Vendored
+1 -1
View File
@@ -3,4 +3,4 @@ package
public val bar: kotlin.Unit
public val bar2: kotlin.Unit
public fun </*0*/ T> arrayListOf(/*0*/ vararg values: T /*kotlin.Array<out T>*/): java.util.ArrayList<T>
public fun </*0*/ T> foo(/*0*/ a: T, /*1*/ b: kotlin.Collection<T>, /*2*/ c: kotlin.Int): kotlin.Unit
public fun </*0*/ T> foo(/*0*/ a: T, /*1*/ b: kotlin.collections.Collection<T>, /*2*/ c: kotlin.Int): kotlin.Unit
compiler/testData/diagnostics/tests/inference/regressions/kt2179.txt
Vendored
+4 -4
View File
@@ -1,10 +1,10 @@
package
package i {
public val kotlin.Collection<*>.size: kotlin.Int
public val kotlin.collections.Collection<*>.size: kotlin.Int
public fun </*0*/ T> arrayList(/*0*/ vararg values: T /*kotlin.Array<out T>*/): java.util.ArrayList<T>
public fun test(): kotlin.Unit
public fun </*0*/ T, /*1*/ R> kotlin.Collection<T>.map(/*0*/ transform: (T) -> R): kotlin.List<R>
public fun </*0*/ T, /*1*/ R, /*2*/ C : kotlin.MutableCollection<in R>> kotlin.Collection<T>.mapTo(/*0*/ result: C, /*1*/ transform: (T) -> R): C
public fun </*0*/ T, /*1*/ C : kotlin.MutableCollection<in T>> kotlin.Array<T>.toCollection(/*0*/ result: C): C
public fun </*0*/ T, /*1*/ R> kotlin.collections.Collection<T>.map(/*0*/ transform: (T) -> R): kotlin.collections.List<R>
public fun </*0*/ T, /*1*/ R, /*2*/ C : kotlin.collections.MutableCollection<in R>> kotlin.collections.Collection<T>.mapTo(/*0*/ result: C, /*1*/ transform: (T) -> R): C
public fun </*0*/ T, /*1*/ C : kotlin.collections.MutableCollection<in T>> kotlin.Array<T>.toCollection(/*0*/ result: C): C
}
compiler/testData/diagnostics/tests/inference/regressions/kt2286.txt
Vendored
+2 -2
View File
@@ -1,12 +1,12 @@
package
package n {
public fun </*0*/ T : kotlin.Any> kotlin.Iterable<T>.find(/*0*/ predicate: (T) -> kotlin.Boolean): T?
public fun </*0*/ T : kotlin.Any> kotlin.collections.Iterable<T>.find(/*0*/ predicate: (T) -> kotlin.Boolean): T?
public abstract class Buggy {
public constructor Buggy()
public final val anotherThree: kotlin.Int
public abstract val coll: kotlin.Collection<kotlin.Int>
public abstract val coll: kotlin.collections.Collection<kotlin.Int>
public final val extendedGetter: kotlin.Int
public final val yetAnotherThree: kotlin.Int
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
compiler/testData/diagnostics/tests/inference/regressions/kt2324.txt
Vendored
+2 -2
View File
@@ -3,7 +3,7 @@ package
package i {
public fun </*0*/ T> arrayList(/*0*/ vararg values: T /*kotlin.Array<out T>*/): java.util.ArrayList<T>
public fun assertEquals(/*0*/ expected: kotlin.Any?, /*1*/ actual: kotlin.Any?, /*2*/ message: kotlin.String = ...): kotlin.Unit
public fun </*0*/ T, /*1*/ K> someFunction(/*0*/ list: kotlin.List<T>, /*1*/ transform: (T) -> K): kotlin.List<K>
public fun </*0*/ T, /*1*/ K> someFunction(/*0*/ list: kotlin.collections.List<T>, /*1*/ transform: (T) -> K): kotlin.collections.List<K>
public fun testSomeFunction(): kotlin.Unit
public fun </*0*/ T, /*1*/ C : kotlin.MutableCollection<in T>> kotlin.Array<T>.toCollection(/*0*/ result: C): C
public fun </*0*/ T, /*1*/ C : kotlin.collections.MutableCollection<in T>> kotlin.Array<T>.toCollection(/*0*/ result: C): C
}
compiler/testData/diagnostics/tests/inference/regressions/kt2407.txt
Vendored
+2 -2
View File
@@ -3,6 +3,6 @@ package
package n {
public fun </*0*/ T> arrayList(/*0*/ vararg values: T /*kotlin.Array<out T>*/): java.util.ArrayList<T>
public fun test(): kotlin.Unit
public fun </*0*/ T> kotlin.Iterable<T>.fold(/*0*/ initial: T, /*1*/ operation: (T, T) -> T): T
public fun </*0*/ T, /*1*/ R> kotlin.Collection<T>.map(/*0*/ transform: (T) -> R): kotlin.List<R>
public fun </*0*/ T> kotlin.collections.Iterable<T>.fold(/*0*/ initial: T, /*1*/ operation: (T, T) -> T): T
public fun </*0*/ T, /*1*/ R> kotlin.collections.Collection<T>.map(/*0*/ transform: (T) -> R): kotlin.collections.List<R>
}
compiler/testData/diagnostics/tests/inference/regressions/kt2459.txt
Vendored
+2 -2
View File
@@ -5,8 +5,8 @@ package b {
public fun </*0*/ T> f(/*0*/ x: T): b.B<T>
public final class B</*0*/ T> {
public constructor B</*0*/ T>(/*0*/ x: kotlin.List<T>)
public final val x: kotlin.List<T>
public constructor B</*0*/ T>(/*0*/ x: kotlin.collections.List<T>)
public final val x: kotlin.collections.List<T>
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
compiler/testData/diagnostics/tests/inference/regressions/kt2741.txt
Vendored
+2 -2
View File
@@ -1,9 +1,9 @@
package
package a {
public fun </*0*/ T> _arrayList(/*0*/ vararg values: T /*kotlin.Array<out T>*/): kotlin.List<T>
public fun </*0*/ T> _arrayList(/*0*/ vararg values: T /*kotlin.Array<out T>*/): kotlin.collections.List<T>
public fun test(): kotlin.Unit
public fun </*0*/ T, /*1*/ R : kotlin.Comparable<R>> kotlin.Iterable<T>._sortBy(/*0*/ f: (T) -> R): kotlin.List<T>
public fun </*0*/ T, /*1*/ R : kotlin.Comparable<R>> kotlin.collections.Iterable<T>._sortBy(/*0*/ f: (T) -> R): kotlin.collections.List<T>
public final class _Pair</*0*/ A> {
public constructor _Pair</*0*/ A>(/*0*/ a: A)
compiler/testData/diagnostics/tests/inference/regressions/kt2838.txt
Vendored
+2 -2
View File
@@ -1,8 +1,8 @@
package
package a {
public fun </*0*/ T> bar(/*0*/ a: T, /*1*/ b: kotlin.Map<T, kotlin.String>): kotlin.String?
public fun </*0*/ T> foo(/*0*/ a: T, /*1*/ b: kotlin.Map<T, kotlin.String>?): kotlin.String?
public fun </*0*/ T> bar(/*0*/ a: T, /*1*/ b: kotlin.collections.Map<T, kotlin.String>): kotlin.String?
public fun </*0*/ T> foo(/*0*/ a: T, /*1*/ b: kotlin.collections.Map<T, kotlin.String>?): kotlin.String?
public fun test(/*0*/ a: kotlin.Int): kotlin.Unit
public fun test1(/*0*/ a: kotlin.Int): kotlin.Unit
public fun test2(/*0*/ a: kotlin.Int): kotlin.Unit
compiler/testData/diagnostics/tests/inference/regressions/kt2842.txt
Vendored
+3 -3
View File
@@ -2,11 +2,11 @@ package
package c {
public fun foo(): kotlin.Boolean
public fun getNullableList(): kotlin.List<kotlin.String>?
public fun getNullableList(): kotlin.collections.List<kotlin.String>?
public fun test(/*0*/ a: c.A<kotlin.Int>?): kotlin.Unit
public fun test(/*0*/ nullabilityInfoMap: kotlin.Map<kotlin.Int, kotlin.Any>?): kotlin.Unit
public fun test(/*0*/ nullabilityInfoMap: kotlin.collections.Map<kotlin.Int, kotlin.Any>?): kotlin.Unit
public fun </*0*/ R> c.A<R>.foo(): kotlin.Unit
public fun </*0*/ K, /*1*/ V> kotlin.Map<K, V>.iterator(): kotlin.Iterator<kotlin.Map.Entry<K, V>>
public fun </*0*/ K, /*1*/ V> kotlin.collections.Map<K, V>.iterator(): kotlin.collections.Iterator<kotlin.collections.Map.Entry<K, V>>
public interface A</*0*/ T> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
compiler/testData/diagnostics/tests/inference/regressions/kt2883.txt
Vendored
+1 -1
View File
@@ -6,7 +6,7 @@ package a {
public fun doAction(/*0*/ action: () -> kotlin.Unit): kotlin.Unit
public fun foo(): kotlin.Unit
public fun test(): kotlin.Unit
public fun testWithoutInference(/*0*/ col: kotlin.MutableCollection<kotlin.Int>): kotlin.Unit
public fun testWithoutInference(/*0*/ col: kotlin.collections.MutableCollection<kotlin.Int>): kotlin.Unit
public final class Y</*0*/ TItem> {
public constructor Y</*0*/ TItem>(/*0*/ itemToString: (TItem) -> kotlin.String)
compiler/testData/diagnostics/tests/inference/regressions/kt3007.txt
Vendored
+5 -5
View File
@@ -2,11 +2,11 @@ package
package a {
public fun tempFun(): a.SomeEnum
public fun </*0*/ T, /*1*/ R> kotlin.Iterable<T>.fold(/*0*/ initial: R, /*1*/ operation: (R, T) -> R): R
public fun kotlin.Iterable<kotlin.Int>.some(): kotlin.Unit
public fun kotlin.Iterable<kotlin.Int>.someInt(): kotlin.Unit
public fun kotlin.Iterable<kotlin.Int>.someSimple(): kotlin.Unit
public fun kotlin.Iterable<kotlin.Int>.someSimpleWithFun(): kotlin.Unit
public fun </*0*/ T, /*1*/ R> kotlin.collections.Iterable<T>.fold(/*0*/ initial: R, /*1*/ operation: (R, T) -> R): R
public fun kotlin.collections.Iterable<kotlin.Int>.some(): kotlin.Unit
public fun kotlin.collections.Iterable<kotlin.Int>.someInt(): kotlin.Unit
public fun kotlin.collections.Iterable<kotlin.Int>.someSimple(): kotlin.Unit
public fun kotlin.collections.Iterable<kotlin.Int>.someSimpleWithFun(): kotlin.Unit
public final enum class SomeEnum : kotlin.Enum<a.SomeEnum> {
enum entry FIRST
compiler/testData/diagnostics/tests/inference/regressions/kt3174.txt
Vendored
+2 -2
View File
@@ -2,7 +2,7 @@ package
package a {
public fun foo(/*0*/ a: kotlin.Any?): kotlin.Any?
public fun test(/*0*/ s: kotlin.String?, /*1*/ l: kotlin.MutableList<kotlin.String>): kotlin.Unit
public fun </*0*/ T> T.fff(/*0*/ l: kotlin.MutableList<T>): kotlin.Boolean
public fun test(/*0*/ s: kotlin.String?, /*1*/ l: kotlin.collections.MutableList<kotlin.String>): kotlin.Unit
public fun </*0*/ T> T.fff(/*0*/ l: kotlin.collections.MutableList<T>): kotlin.Boolean
public fun </*0*/ T : kotlin.Any> T.test(): T
}
compiler/testData/diagnostics/tests/inference/regressions/kt3344.txt
Vendored
+2 -2
View File
@@ -12,8 +12,8 @@ package i {
}
public final class Foo {
public constructor Foo(/*0*/ attributes: kotlin.Map<kotlin.String, kotlin.String>)
public final val attributes: kotlin.Map<kotlin.String, kotlin.String>
public constructor Foo(/*0*/ attributes: kotlin.collections.Map<kotlin.String, kotlin.String>)
public final val attributes: kotlin.collections.Map<kotlin.String, kotlin.String>
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
compiler/testData/diagnostics/tests/inference/regressions/kt3496.txt
Vendored
+1 -1
View File
@@ -6,5 +6,5 @@ public final class B</*0*/ T> {
public final operator fun </*0*/ S> get(/*0*/ s: kotlin.String): S
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public final fun </*0*/ S> x(/*0*/ y: B<kotlin.Iterable<S>>): kotlin.Unit
public final fun </*0*/ S> x(/*0*/ y: B<kotlin.collections.Iterable<S>>): kotlin.Unit
}
compiler/testData/diagnostics/tests/inference/regressions/kt8132.txt
Vendored
+2 -2
View File
@@ -1,4 +1,4 @@
package
public fun </*0*/ T> test(/*0*/ foo: kotlin.List<T>): T
public fun </*0*/ S, /*1*/ T : S> kotlin.Iterable<T>.reduce(/*0*/ operation: (S, T) -> S): S
public fun </*0*/ T> test(/*0*/ foo: kotlin.collections.List<T>): T
public fun </*0*/ S, /*1*/ T : S> kotlin.collections.Iterable<T>.reduce(/*0*/ operation: (S, T) -> S): S
compiler/testData/diagnostics/tests/inference/regressions/kt943.txt
Vendored
+1 -1
View File
@@ -2,6 +2,6 @@ package
package maze {
public inline fun </*0*/ T> comparator(/*0*/ fn: (T, T) -> kotlin.Int): java.util.Comparator<T>
public fun foo(/*0*/ lines: kotlin.List<kotlin.String>): kotlin.Unit
public fun foo(/*0*/ lines: kotlin.collections.List<kotlin.String>): kotlin.Unit
public fun </*0*/ T : kotlin.Any> T?.sure(): T
}
compiler/testData/diagnostics/tests/inference/regressions/kt948.txt
Vendored
+2 -2
View File
@@ -1,7 +1,7 @@
package
package a {
public fun doWithList(/*0*/ list: kotlin.List<kotlin.Int>): kotlin.List<kotlin.Int>
public fun </*0*/ T> emptyList(): kotlin.List<T>?
public fun doWithList(/*0*/ list: kotlin.collections.List<kotlin.Int>): kotlin.collections.List<kotlin.Int>
public fun </*0*/ T> emptyList(): kotlin.collections.List<T>?
public fun foo(): kotlin.Unit
}