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

FIR deserializer: load type-parameters correctly

Browse Source
This commit is contained in:
Simon Ogorodnik
2019-04-08 15:44:09 +03:00
committed by Mikhail Glukhikh
parent 853167a24d
commit 649c2f6bcc
54 changed files with 164 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/testData/builtIns/kotlin-collections.txt
Vendored
+10 -10
View File
@@ -25,7 +25,7 @@ public abstract class CharIterator : R|kotlin/collections/Iterator<kotlin/Char>|
}
public abstract interface Collection<E> : R|kotlin/collections/Iterable<E>| {
public abstract interface Collection<out E> : R|kotlin/collections/Iterable<E>| {
public abstract operator fun contains(element: R|E|): R|kotlin/Boolean|
public abstract fun containsAll(elements: R|kotlin/collections/Collection<E>|): R|kotlin/Boolean|
@@ -63,19 +63,19 @@ public abstract class IntIterator : R|kotlin/collections/Iterator<kotlin/Int>| {
}
public abstract interface Iterable<T> : R|kotlin/Any| {
public abstract interface Iterable<out T> : R|kotlin/Any| {
public abstract operator fun iterator(): R|kotlin/collections/Iterator<T>|
}
public abstract interface Iterator<T> : R|kotlin/Any| {
public abstract interface Iterator<out T> : R|kotlin/Any| {
public abstract operator fun hasNext(): R|kotlin/Boolean|
public abstract operator fun next(): R|T|
}
public abstract interface List<E> : R|kotlin/collections/Collection<E>| {
public abstract interface List<out E> : R|kotlin/collections/Collection<E>| {
public abstract operator fun contains(element: R|E|): R|kotlin/Boolean|
public abstract fun containsAll(elements: R|kotlin/collections/Collection<E>|): R|kotlin/Boolean|
@@ -98,7 +98,7 @@ public abstract interface List<E> : R|kotlin/collections/Collection<E>| {
}
public abstract interface ListIterator<T> : R|kotlin/collections/Iterator<T>| {
public abstract interface ListIterator<out T> : R|kotlin/collections/Iterator<T>| {
public abstract operator fun hasNext(): R|kotlin/Boolean|
public abstract fun hasPrevious(): R|kotlin/Boolean|
@@ -122,7 +122,7 @@ public abstract class LongIterator : R|kotlin/collections/Iterator<kotlin/Long>|
}
public abstract interface Map<K, V> : R|kotlin/Any| {
public abstract interface Map<K, out V> : R|kotlin/Any| {
public abstract fun containsKey(key: R|K|): R|kotlin/Boolean|
public abstract fun containsValue(value: R|V|): R|kotlin/Boolean|
@@ -133,7 +133,7 @@ public abstract interface Map<K, V> : R|kotlin/Any| {
public abstract fun isEmpty(): R|kotlin/Boolean|
public abstract interface Entry<K, V> : R|kotlin/Any| {
public abstract interface Entry<out K, out V> : R|kotlin/Any| {
}
}
@@ -155,12 +155,12 @@ public abstract interface MutableCollection<E> : R|kotlin/collections/Collection
}
public abstract interface MutableIterable<T> : R|kotlin/collections/Iterable<T>| {
public abstract interface MutableIterable<out T> : R|kotlin/collections/Iterable<T>| {
public abstract operator fun iterator(): R|kotlin/collections/MutableIterator<T>|
}
public abstract interface MutableIterator<T> : R|kotlin/collections/Iterator<T>| {
public abstract interface MutableIterator<out T> : R|kotlin/collections/Iterator<T>| {
public abstract fun remove(): R|kotlin/Unit|
}
@@ -242,7 +242,7 @@ public abstract interface MutableSet<E> : R|kotlin/collections/Set<E>|, R|kotlin
}
public abstract interface Set<E> : R|kotlin/collections/Collection<E>| {
public abstract interface Set<out E> : R|kotlin/collections/Collection<E>| {
public abstract operator fun contains(element: R|E|): R|kotlin/Boolean|
public abstract fun containsAll(elements: R|kotlin/collections/Collection<E>|): R|kotlin/Boolean|
compiler/fir/resolve/testData/builtIns/kotlin.txt
Vendored
+7 -7
View File
@@ -1,6 +1,6 @@
public final inline fun <T> arrayOf(vararg elements: R|kotlin/Array<out T>|): R|kotlin/Array<T>|
public final inline fun <reified T> arrayOf(vararg elements: R|kotlin/Array<out T>|): R|kotlin/Array<T>|
public final fun <T> arrayOfNulls(size: R|kotlin/Int|): R|kotlin/Array<T>|
public final fun <reified T> arrayOfNulls(size: R|kotlin/Int|): R|kotlin/Array<T>|
public final fun booleanArrayOf(vararg elements: R|kotlin/BooleanArray|): R|kotlin/BooleanArray|
@@ -10,11 +10,11 @@ public final fun charArrayOf(vararg elements: R|kotlin/CharArray|): R|kotlin/Cha
public final fun doubleArrayOf(vararg elements: R|kotlin/DoubleArray|): R|kotlin/DoubleArray|
public final inline fun <T> emptyArray(): R|kotlin/Array<T>|
public final inline fun <reified T> emptyArray(): R|kotlin/Array<T>|
public final inline fun <T> enumValueOf(name: R|kotlin/String|): R|T|
public final inline fun <reified T> enumValueOf(name: R|kotlin/String|): R|T|
public final inline fun <T> enumValues(): R|kotlin/Array<T>|
public final inline fun <reified T> enumValues(): R|kotlin/Array<T>|
public final fun floatArrayOf(vararg elements: R|kotlin/FloatArray|): R|kotlin/FloatArray|
@@ -286,7 +286,7 @@ public abstract interface Cloneable : R|kotlin/Any| {
}
public abstract interface Comparable<T> : R|kotlin/Any| {
public abstract interface Comparable<in T> : R|kotlin/Any| {
public abstract operator fun compareTo(other: R|T|): R|kotlin/Int|
}
@@ -589,7 +589,7 @@ public final class FloatArray : R|kotlin/Any| {
}
public abstract interface Function<R> : R|kotlin/Any| {
public abstract interface Function<out R> : R|kotlin/Any| {
}
public final class Int : R|kotlin/Number|, R|kotlin/Comparable<kotlin/Int>| {