From 3262a4ddc2739a034749a5b34ff7c35347cc5343 Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Wed, 25 Nov 2015 07:45:23 +0300 Subject: [PATCH] LoadBuiltinsTest inspects three packages: kotlin, kotlin.collections and kotlin.ranges --- .../builtin-classes-kotlin-collections.txt | 234 +++++++ .../builtin-classes-kotlin-ranges.txt | 356 ++++++++++ ...classes.txt => builtin-classes-kotlin.txt} | 644 +----------------- .../builtins/LoadBuiltinsTest.java | 23 +- 4 files changed, 631 insertions(+), 626 deletions(-) create mode 100644 compiler/testData/builtin-classes-kotlin-collections.txt create mode 100644 compiler/testData/builtin-classes-kotlin-ranges.txt rename compiler/testData/{builtin-classes.txt => builtin-classes-kotlin.txt} (52%) diff --git a/compiler/testData/builtin-classes-kotlin-collections.txt b/compiler/testData/builtin-classes-kotlin-collections.txt new file mode 100644 index 00000000000..2a6c089b0b4 --- /dev/null +++ b/compiler/testData/builtin-classes-kotlin-collections.txt @@ -0,0 +1,234 @@ +package-fragment kotlin.collections + +public abstract class BooleanIterator : kotlin.collections.Iterator { + /*primary*/ public constructor BooleanIterator() + public abstract override /*1*/ /*fake_override*/ fun hasNext(): kotlin.Boolean + public final override /*1*/ fun next(): kotlin.Boolean + public abstract fun nextBoolean(): kotlin.Boolean +} + +public abstract class ByteIterator : kotlin.collections.Iterator { + /*primary*/ public constructor ByteIterator() + public abstract override /*1*/ /*fake_override*/ fun hasNext(): kotlin.Boolean + public final override /*1*/ fun next(): kotlin.Byte + public abstract fun nextByte(): kotlin.Byte +} + +public abstract class CharIterator : kotlin.collections.Iterator { + /*primary*/ public constructor CharIterator() + public abstract override /*1*/ /*fake_override*/ fun hasNext(): kotlin.Boolean + public final override /*1*/ fun next(): kotlin.Char + public abstract fun nextChar(): kotlin.Char +} + +public interface Collection : kotlin.collections.Iterable { + public abstract val size: kotlin.Int + public abstract fun (): kotlin.Int + public abstract operator fun contains(/*0*/ element: @kotlin.UnsafeVariance() E): kotlin.Boolean + public abstract fun containsAll(/*0*/ elements: kotlin.collections.Collection<@kotlin.UnsafeVariance() E>): kotlin.Boolean + public abstract fun isEmpty(): kotlin.Boolean + public abstract override /*1*/ fun iterator(): kotlin.collections.Iterator +} + +public abstract class DoubleIterator : kotlin.collections.Iterator { + /*primary*/ public constructor DoubleIterator() + public abstract override /*1*/ /*fake_override*/ fun hasNext(): kotlin.Boolean + public final override /*1*/ fun next(): kotlin.Double + public abstract fun nextDouble(): kotlin.Double +} + +public abstract class FloatIterator : kotlin.collections.Iterator { + /*primary*/ public constructor FloatIterator() + public abstract override /*1*/ /*fake_override*/ fun hasNext(): kotlin.Boolean + public final override /*1*/ fun next(): kotlin.Float + public abstract fun nextFloat(): kotlin.Float +} + +public abstract class IntIterator : kotlin.collections.Iterator { + /*primary*/ public constructor IntIterator() + public abstract override /*1*/ /*fake_override*/ fun hasNext(): kotlin.Boolean + public final override /*1*/ fun next(): kotlin.Int + public abstract fun nextInt(): kotlin.Int +} + +public interface Iterable { + public abstract operator fun iterator(): kotlin.collections.Iterator +} + +public interface Iterator { + public abstract operator fun hasNext(): kotlin.Boolean + public abstract operator fun next(): T +} + +public interface List : kotlin.collections.Collection { + public abstract override /*1*/ val size: kotlin.Int + public abstract override /*1*/ fun (): kotlin.Int + public abstract override /*1*/ fun contains(/*0*/ element: @kotlin.UnsafeVariance() E): kotlin.Boolean + public abstract override /*1*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection<@kotlin.UnsafeVariance() E>): kotlin.Boolean + public abstract operator fun get(/*0*/ index: kotlin.Int): E + public abstract fun indexOf(/*0*/ element: @kotlin.UnsafeVariance() E): kotlin.Int + public abstract override /*1*/ fun isEmpty(): kotlin.Boolean + public abstract override /*1*/ fun iterator(): kotlin.collections.Iterator + public abstract fun lastIndexOf(/*0*/ element: @kotlin.UnsafeVariance() E): kotlin.Int + public abstract fun listIterator(): kotlin.collections.ListIterator + public abstract fun listIterator(/*0*/ index: kotlin.Int): kotlin.collections.ListIterator + public abstract fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.collections.List +} + +public interface ListIterator : kotlin.collections.Iterator { + public abstract override /*1*/ fun hasNext(): kotlin.Boolean + public abstract fun hasPrevious(): kotlin.Boolean + public abstract override /*1*/ fun next(): T + public abstract fun nextIndex(): kotlin.Int + public abstract fun previous(): T + public abstract fun previousIndex(): kotlin.Int +} + +public abstract class LongIterator : kotlin.collections.Iterator { + /*primary*/ public constructor LongIterator() + public abstract override /*1*/ /*fake_override*/ fun hasNext(): kotlin.Boolean + public final override /*1*/ fun next(): kotlin.Long + public abstract fun nextLong(): kotlin.Long +} + +public interface Map { + public abstract val entries: kotlin.collections.Set> + public abstract fun (): kotlin.collections.Set> + public abstract val keys: kotlin.collections.Set + public abstract fun (): kotlin.collections.Set + public abstract val size: kotlin.Int + public abstract fun (): kotlin.Int + public abstract val values: kotlin.collections.Collection + public abstract fun (): kotlin.collections.Collection + public abstract fun containsKey(/*0*/ key: K): kotlin.Boolean + public abstract fun containsValue(/*0*/ value: @kotlin.UnsafeVariance() V): kotlin.Boolean + public abstract operator fun get(/*0*/ key: K): V? + public abstract fun isEmpty(): kotlin.Boolean + + public interface Entry { + public abstract val key: K + public abstract fun (): K + public abstract val value: V + public abstract fun (): V + } +} + +public interface MutableCollection : kotlin.collections.Collection, kotlin.collections.MutableIterable { + public abstract override /*1*/ /*fake_override*/ val size: kotlin.Int + public abstract override /*1*/ /*fake_override*/ fun (): kotlin.Int + public abstract fun add(/*0*/ element: E): kotlin.Boolean + public abstract fun addAll(/*0*/ elements: kotlin.collections.Collection): kotlin.Boolean + public abstract fun clear(): kotlin.Unit + public abstract override /*1*/ /*fake_override*/ fun contains(/*0*/ element: E): kotlin.Boolean + public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection): kotlin.Boolean + public abstract override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean + public abstract override /*2*/ fun iterator(): kotlin.collections.MutableIterator + public abstract fun remove(/*0*/ element: E): kotlin.Boolean + public abstract fun removeAll(/*0*/ elements: kotlin.collections.Collection): kotlin.Boolean + public abstract fun retainAll(/*0*/ elements: kotlin.collections.Collection): kotlin.Boolean +} + +public interface MutableIterable : kotlin.collections.Iterable { + public abstract override /*1*/ fun iterator(): kotlin.collections.MutableIterator +} + +public interface MutableIterator : kotlin.collections.Iterator { + public abstract override /*1*/ /*fake_override*/ fun hasNext(): kotlin.Boolean + public abstract override /*1*/ /*fake_override*/ fun next(): T + public abstract fun remove(): kotlin.Unit +} + +public interface MutableList : kotlin.collections.List, kotlin.collections.MutableCollection { + public abstract override /*2*/ /*fake_override*/ val size: kotlin.Int + public abstract override /*2*/ /*fake_override*/ fun (): kotlin.Int + public abstract override /*1*/ fun add(/*0*/ element: E): kotlin.Boolean + public abstract fun add(/*0*/ index: kotlin.Int, /*1*/ element: E): kotlin.Unit + public abstract fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.collections.Collection): kotlin.Boolean + public abstract override /*1*/ fun addAll(/*0*/ elements: kotlin.collections.Collection): kotlin.Boolean + public abstract override /*1*/ fun clear(): kotlin.Unit + public abstract override /*2*/ /*fake_override*/ fun contains(/*0*/ element: E): kotlin.Boolean + public abstract override /*2*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection): kotlin.Boolean + public abstract override /*1*/ /*fake_override*/ fun get(/*0*/ index: kotlin.Int): E + public abstract override /*1*/ /*fake_override*/ fun indexOf(/*0*/ element: E): kotlin.Int + public abstract override /*2*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean + public abstract override /*2*/ /*fake_override*/ fun iterator(): kotlin.collections.MutableIterator + public abstract override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ element: E): kotlin.Int + public abstract override /*1*/ fun listIterator(): kotlin.collections.MutableListIterator + public abstract override /*1*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.collections.MutableListIterator + public abstract override /*1*/ fun remove(/*0*/ element: E): kotlin.Boolean + public abstract override /*1*/ fun removeAll(/*0*/ elements: kotlin.collections.Collection): kotlin.Boolean + public abstract fun removeAt(/*0*/ index: kotlin.Int): E + public abstract override /*1*/ fun retainAll(/*0*/ elements: kotlin.collections.Collection): kotlin.Boolean + public abstract operator fun set(/*0*/ index: kotlin.Int, /*1*/ element: E): E + public abstract override /*1*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.collections.MutableList +} + +public interface MutableListIterator : kotlin.collections.ListIterator, kotlin.collections.MutableIterator { + public abstract fun add(/*0*/ element: T): kotlin.Unit + public abstract override /*2*/ fun hasNext(): kotlin.Boolean + public abstract override /*1*/ /*fake_override*/ fun hasPrevious(): kotlin.Boolean + public abstract override /*2*/ fun next(): T + public abstract override /*1*/ /*fake_override*/ fun nextIndex(): kotlin.Int + public abstract override /*1*/ /*fake_override*/ fun previous(): T + public abstract override /*1*/ /*fake_override*/ fun previousIndex(): kotlin.Int + public abstract override /*1*/ fun remove(): kotlin.Unit + public abstract fun set(/*0*/ element: T): kotlin.Unit +} + +public interface MutableMap : kotlin.collections.Map { + public abstract override /*1*/ val entries: kotlin.collections.MutableSet> + public abstract override /*1*/ fun (): kotlin.collections.MutableSet> + public abstract override /*1*/ val keys: kotlin.collections.MutableSet + public abstract override /*1*/ fun (): kotlin.collections.MutableSet + public abstract override /*1*/ /*fake_override*/ val size: kotlin.Int + public abstract override /*1*/ /*fake_override*/ fun (): kotlin.Int + public abstract override /*1*/ val values: kotlin.collections.MutableCollection + public abstract override /*1*/ fun (): kotlin.collections.MutableCollection + public abstract fun clear(): kotlin.Unit + public abstract override /*1*/ /*fake_override*/ fun containsKey(/*0*/ key: K): kotlin.Boolean + public abstract override /*1*/ /*fake_override*/ fun containsValue(/*0*/ value: V): kotlin.Boolean + public abstract override /*1*/ /*fake_override*/ fun get(/*0*/ key: K): V? + public abstract override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean + public abstract fun put(/*0*/ key: K, /*1*/ value: V): V? + public abstract fun putAll(/*0*/ from: kotlin.collections.Map): kotlin.Unit + public abstract fun remove(/*0*/ key: K): V? + + public interface MutableEntry : kotlin.collections.Map.Entry { + public abstract override /*1*/ /*fake_override*/ val key: K + public abstract override /*1*/ /*fake_override*/ fun (): K + public abstract override /*1*/ /*fake_override*/ val value: V + public abstract override /*1*/ /*fake_override*/ fun (): V + public abstract fun setValue(/*0*/ newValue: V): V + } +} + +public interface MutableSet : kotlin.collections.Set, kotlin.collections.MutableCollection { + public abstract override /*2*/ /*fake_override*/ val size: kotlin.Int + public abstract override /*2*/ /*fake_override*/ fun (): kotlin.Int + public abstract override /*1*/ fun add(/*0*/ element: E): kotlin.Boolean + public abstract override /*1*/ fun addAll(/*0*/ elements: kotlin.collections.Collection): kotlin.Boolean + public abstract override /*1*/ fun clear(): kotlin.Unit + public abstract override /*2*/ /*fake_override*/ fun contains(/*0*/ element: E): kotlin.Boolean + public abstract override /*2*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection): kotlin.Boolean + public abstract override /*2*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean + public abstract override /*2*/ fun iterator(): kotlin.collections.MutableIterator + public abstract override /*1*/ fun remove(/*0*/ element: E): kotlin.Boolean + public abstract override /*1*/ fun removeAll(/*0*/ elements: kotlin.collections.Collection): kotlin.Boolean + public abstract override /*1*/ fun retainAll(/*0*/ elements: kotlin.collections.Collection): kotlin.Boolean +} + +public interface Set : kotlin.collections.Collection { + public abstract override /*1*/ val size: kotlin.Int + public abstract override /*1*/ fun (): kotlin.Int + public abstract override /*1*/ fun contains(/*0*/ element: @kotlin.UnsafeVariance() E): kotlin.Boolean + public abstract override /*1*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection<@kotlin.UnsafeVariance() E>): kotlin.Boolean + public abstract override /*1*/ fun isEmpty(): kotlin.Boolean + public abstract override /*1*/ fun iterator(): kotlin.collections.Iterator +} + +public abstract class ShortIterator : kotlin.collections.Iterator { + /*primary*/ public constructor ShortIterator() + public abstract override /*1*/ /*fake_override*/ fun hasNext(): kotlin.Boolean + public final override /*1*/ fun next(): kotlin.Short + public abstract fun nextShort(): kotlin.Short +} diff --git a/compiler/testData/builtin-classes-kotlin-ranges.txt b/compiler/testData/builtin-classes-kotlin-ranges.txt new file mode 100644 index 00000000000..b6b87bfae9a --- /dev/null +++ b/compiler/testData/builtin-classes-kotlin-ranges.txt @@ -0,0 +1,356 @@ +package-fragment kotlin.ranges + +@kotlin.Deprecated(level = DeprecationLevel.WARNING, message = "Use IntProgression instead.", replaceWith = kotlin.ReplaceWith(expression = "IntProgression", imports = {})) public open class ByteProgression : kotlin.Progression { + /*primary*/ @kotlin.Deprecated(message = "This constructor will become private soon. Use ByteProgression.fromClosedRange() instead.", replaceWith = kotlin.ReplaceWith(expression = "ByteProgression.fromClosedRange(start, endInclusive, step)", imports = {})) public constructor ByteProgression(/*0*/ start: kotlin.Byte, /*1*/ endInclusive: kotlin.Byte, /*2*/ step: kotlin.Int) + @kotlin.Deprecated(message = "Use 'last' property instead.") public open override /*1*/ val end: kotlin.Byte + public open override /*1*/ fun (): kotlin.Byte + public final val first: kotlin.Byte + public final fun (): kotlin.Byte + @kotlin.Deprecated(message = "Use 'step' property instead.", replaceWith = kotlin.ReplaceWith(expression = "step", imports = {})) public open override /*1*/ val increment: kotlin.Int + public open override /*1*/ fun (): kotlin.Int + public final val last: kotlin.Byte + public final fun (): kotlin.Byte + @kotlin.Deprecated(message = "Use 'first' property instead.", replaceWith = kotlin.ReplaceWith(expression = "first", imports = {})) public open override /*1*/ val start: kotlin.Byte + public open override /*1*/ fun (): kotlin.Byte + public final val step: kotlin.Int + public final fun (): kotlin.Int + public open fun isEmpty(): kotlin.Boolean + public open override /*1*/ fun iterator(): kotlin.collections.ByteIterator + + public companion object Companion { + /*primary*/ private constructor Companion() + public final fun fromClosedRange(/*0*/ rangeStart: kotlin.Byte, /*1*/ rangeEnd: kotlin.Byte, /*2*/ step: kotlin.Int): kotlin.ranges.ByteProgression + } +} + +internal final class ByteProgressionIterator : kotlin.collections.ByteIterator { + /*primary*/ public constructor ByteProgressionIterator(/*0*/ first: kotlin.Byte, /*1*/ last: kotlin.Byte, /*2*/ step: kotlin.Int) + private final val finalElement: kotlin.Int + private final fun (): kotlin.Int + private final var hasNext: kotlin.Boolean + private final fun (): kotlin.Boolean + private final fun (/*0*/ : kotlin.Boolean): kotlin.Unit + private final var next: kotlin.Int + private final fun (): kotlin.Int + private final fun (/*0*/ : kotlin.Int): kotlin.Unit + public final val step: kotlin.Int + public final fun (): kotlin.Int + public open override /*1*/ fun hasNext(): kotlin.Boolean + public final override /*1*/ /*fake_override*/ fun next(): kotlin.Byte + public open override /*1*/ fun nextByte(): kotlin.Byte +} + +@kotlin.Deprecated(level = DeprecationLevel.WARNING, message = "Use IntRange instead.", replaceWith = kotlin.ReplaceWith(expression = "IntRange", imports = {})) public final class ByteRange : kotlin.ranges.ByteProgression, kotlin.ranges.ClosedRange { + /*primary*/ public constructor ByteRange(/*0*/ start: kotlin.Byte, /*1*/ endInclusive: kotlin.Byte) + @kotlin.Deprecated(message = "Use endInclusive instead.", replaceWith = kotlin.ReplaceWith(expression = "endInclusive", imports = {})) public open override /*2*/ val end: kotlin.Byte + public open override /*2*/ fun (): kotlin.Byte + public open override /*1*/ val endInclusive: kotlin.Byte + public open override /*1*/ fun (): kotlin.Byte + public final override /*1*/ /*fake_override*/ val first: kotlin.Byte + public final override /*1*/ /*fake_override*/ fun (): kotlin.Byte + @kotlin.Deprecated(message = "Use 'step' property instead.", replaceWith = kotlin.ReplaceWith(expression = "step", imports = {})) public open override /*1*/ /*fake_override*/ val increment: kotlin.Int + public open override /*1*/ /*fake_override*/ fun (): kotlin.Int + public final override /*1*/ /*fake_override*/ val last: kotlin.Byte + public final override /*1*/ /*fake_override*/ fun (): kotlin.Byte + public open override /*2*/ val start: kotlin.Byte + public open override /*2*/ fun (): kotlin.Byte + public final override /*1*/ /*fake_override*/ val step: kotlin.Int + public final override /*1*/ /*fake_override*/ fun (): kotlin.Int + public open override /*1*/ fun contains(/*0*/ value: kotlin.Byte): kotlin.Boolean + public open override /*2*/ fun isEmpty(): kotlin.Boolean + public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.collections.ByteIterator + + public companion object Companion { + /*primary*/ private constructor Companion() + public final val EMPTY: kotlin.ranges.ByteRange + public final fun (): kotlin.ranges.ByteRange + } +} + +public open class CharProgression : kotlin.Progression { + /*primary*/ @kotlin.Deprecated(message = "This constructor will become private soon. Use CharProgression.fromClosedRange() instead.", replaceWith = kotlin.ReplaceWith(expression = "CharProgression.fromClosedRange(start, endInclusive, step)", imports = {})) public constructor CharProgression(/*0*/ start: kotlin.Char, /*1*/ endInclusive: kotlin.Char, /*2*/ step: kotlin.Int) + @kotlin.Deprecated(message = "Use 'last' property instead.") public open override /*1*/ val end: kotlin.Char + public open override /*1*/ fun (): kotlin.Char + public final val first: kotlin.Char + public final fun (): kotlin.Char + @kotlin.Deprecated(message = "Use 'step' property instead.", replaceWith = kotlin.ReplaceWith(expression = "step", imports = {})) public open override /*1*/ val increment: kotlin.Int + public open override /*1*/ fun (): kotlin.Int + public final val last: kotlin.Char + public final fun (): kotlin.Char + @kotlin.Deprecated(message = "Use 'first' property instead.", replaceWith = kotlin.ReplaceWith(expression = "first", imports = {})) public open override /*1*/ val start: kotlin.Char + public open override /*1*/ fun (): kotlin.Char + public final val step: kotlin.Int + public final fun (): kotlin.Int + public open fun isEmpty(): kotlin.Boolean + public open override /*1*/ fun iterator(): kotlin.collections.CharIterator + + public companion object Companion { + /*primary*/ private constructor Companion() + public final fun fromClosedRange(/*0*/ rangeStart: kotlin.Char, /*1*/ rangeEnd: kotlin.Char, /*2*/ step: kotlin.Int): kotlin.ranges.CharProgression + } +} + +internal final class CharProgressionIterator : kotlin.collections.CharIterator { + /*primary*/ public constructor CharProgressionIterator(/*0*/ first: kotlin.Char, /*1*/ last: kotlin.Char, /*2*/ step: kotlin.Int) + private final val finalElement: kotlin.Int + private final fun (): kotlin.Int + private final var hasNext: kotlin.Boolean + private final fun (): kotlin.Boolean + private final fun (/*0*/ : kotlin.Boolean): kotlin.Unit + private final var next: kotlin.Int + private final fun (): kotlin.Int + private final fun (/*0*/ : kotlin.Int): kotlin.Unit + public final val step: kotlin.Int + public final fun (): kotlin.Int + public open override /*1*/ fun hasNext(): kotlin.Boolean + public final override /*1*/ /*fake_override*/ fun next(): kotlin.Char + public open override /*1*/ fun nextChar(): kotlin.Char +} + +public final class CharRange : kotlin.ranges.CharProgression, kotlin.ranges.ClosedRange { + /*primary*/ public constructor CharRange(/*0*/ start: kotlin.Char, /*1*/ endInclusive: kotlin.Char) + @kotlin.Deprecated(message = "Use endInclusive instead.", replaceWith = kotlin.ReplaceWith(expression = "endInclusive", imports = {})) public open override /*2*/ val end: kotlin.Char + public open override /*2*/ fun (): kotlin.Char + public open override /*1*/ val endInclusive: kotlin.Char + public open override /*1*/ fun (): kotlin.Char + public final override /*1*/ /*fake_override*/ val first: kotlin.Char + public final override /*1*/ /*fake_override*/ fun (): kotlin.Char + @kotlin.Deprecated(message = "Use 'step' property instead.", replaceWith = kotlin.ReplaceWith(expression = "step", imports = {})) public open override /*1*/ /*fake_override*/ val increment: kotlin.Int + public open override /*1*/ /*fake_override*/ fun (): kotlin.Int + public final override /*1*/ /*fake_override*/ val last: kotlin.Char + public final override /*1*/ /*fake_override*/ fun (): kotlin.Char + public open override /*2*/ val start: kotlin.Char + public open override /*2*/ fun (): kotlin.Char + public final override /*1*/ /*fake_override*/ val step: kotlin.Int + public final override /*1*/ /*fake_override*/ fun (): kotlin.Int + public open override /*1*/ fun contains(/*0*/ value: kotlin.Char): kotlin.Boolean + public open override /*2*/ fun isEmpty(): kotlin.Boolean + public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.collections.CharIterator + + public companion object Companion { + /*primary*/ private constructor Companion() + public final val EMPTY: kotlin.ranges.CharRange + public final fun (): kotlin.ranges.CharRange + } +} + +public interface ClosedRange> : kotlin.ranges.Range { + @kotlin.Deprecated(message = "Use endInclusive instead.", replaceWith = kotlin.ReplaceWith(expression = "endInclusive", imports = {})) public open override /*1*/ val end: T + public open override /*1*/ fun (): T + public abstract val endInclusive: T + public abstract fun (): T + public abstract override /*1*/ val start: T + public abstract override /*1*/ fun (): T + public open override /*1*/ fun contains(/*0*/ value: T): kotlin.Boolean + public open override /*1*/ fun isEmpty(): kotlin.Boolean +} + +public open class IntProgression : kotlin.Progression { + /*primary*/ @kotlin.Deprecated(message = "This constructor will become private soon. Use IntProgression.fromClosedRange() instead.", replaceWith = kotlin.ReplaceWith(expression = "IntProgression.fromClosedRange(start, endInclusive, step)", imports = {})) public constructor IntProgression(/*0*/ start: kotlin.Int, /*1*/ endInclusive: kotlin.Int, /*2*/ step: kotlin.Int) + @kotlin.Deprecated(message = "Use 'last' property instead.") public open override /*1*/ val end: kotlin.Int + public open override /*1*/ fun (): kotlin.Int + public final val first: kotlin.Int + public final fun (): kotlin.Int + @kotlin.Deprecated(message = "Use 'step' property instead.", replaceWith = kotlin.ReplaceWith(expression = "step", imports = {})) public open override /*1*/ val increment: kotlin.Int + public open override /*1*/ fun (): kotlin.Int + public final val last: kotlin.Int + public final fun (): kotlin.Int + @kotlin.Deprecated(message = "Use 'first' property instead.", replaceWith = kotlin.ReplaceWith(expression = "first", imports = {})) public open override /*1*/ val start: kotlin.Int + public open override /*1*/ fun (): kotlin.Int + public final val step: kotlin.Int + public final fun (): kotlin.Int + public open fun isEmpty(): kotlin.Boolean + public open override /*1*/ fun iterator(): kotlin.collections.IntIterator + + public companion object Companion { + /*primary*/ private constructor Companion() + public final fun fromClosedRange(/*0*/ rangeStart: kotlin.Int, /*1*/ rangeEnd: kotlin.Int, /*2*/ step: kotlin.Int): kotlin.ranges.IntProgression + } +} + +internal final class IntProgressionIterator : kotlin.collections.IntIterator { + /*primary*/ public constructor IntProgressionIterator(/*0*/ first: kotlin.Int, /*1*/ last: kotlin.Int, /*2*/ step: kotlin.Int) + private final val finalElement: kotlin.Int + private final fun (): kotlin.Int + private final var hasNext: kotlin.Boolean + private final fun (): kotlin.Boolean + private final fun (/*0*/ : kotlin.Boolean): kotlin.Unit + private final var next: kotlin.Int + private final fun (): kotlin.Int + private final fun (/*0*/ : kotlin.Int): kotlin.Unit + public final val step: kotlin.Int + public final fun (): kotlin.Int + public open override /*1*/ fun hasNext(): kotlin.Boolean + public final override /*1*/ /*fake_override*/ fun next(): kotlin.Int + public open override /*1*/ fun nextInt(): kotlin.Int +} + +public final class IntRange : kotlin.ranges.IntProgression, kotlin.ranges.ClosedRange { + /*primary*/ public constructor IntRange(/*0*/ start: kotlin.Int, /*1*/ endInclusive: kotlin.Int) + @kotlin.Deprecated(message = "Use endInclusive instead.", replaceWith = kotlin.ReplaceWith(expression = "endInclusive", imports = {})) public open override /*2*/ val end: kotlin.Int + public open override /*2*/ fun (): kotlin.Int + public open override /*1*/ val endInclusive: kotlin.Int + public open override /*1*/ fun (): kotlin.Int + public final override /*1*/ /*fake_override*/ val first: kotlin.Int + public final override /*1*/ /*fake_override*/ fun (): kotlin.Int + @kotlin.Deprecated(message = "Use 'step' property instead.", replaceWith = kotlin.ReplaceWith(expression = "step", imports = {})) public open override /*1*/ /*fake_override*/ val increment: kotlin.Int + public open override /*1*/ /*fake_override*/ fun (): kotlin.Int + public final override /*1*/ /*fake_override*/ val last: kotlin.Int + public final override /*1*/ /*fake_override*/ fun (): kotlin.Int + public open override /*2*/ val start: kotlin.Int + public open override /*2*/ fun (): kotlin.Int + public final override /*1*/ /*fake_override*/ val step: kotlin.Int + public final override /*1*/ /*fake_override*/ fun (): kotlin.Int + public open override /*1*/ fun contains(/*0*/ value: kotlin.Int): kotlin.Boolean + public open override /*2*/ fun isEmpty(): kotlin.Boolean + public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.collections.IntIterator + + public companion object Companion { + /*primary*/ private constructor Companion() + public final val EMPTY: kotlin.ranges.IntRange + public final fun (): kotlin.ranges.IntRange + } +} + +public open class LongProgression : kotlin.Progression { + /*primary*/ @kotlin.Deprecated(message = "This constructor will become private soon. Use LongProgression.fromClosedRange() instead.", replaceWith = kotlin.ReplaceWith(expression = "LongProgression.fromClosedRange(start, endInclusive, step)", imports = {})) public constructor LongProgression(/*0*/ start: kotlin.Long, /*1*/ endInclusive: kotlin.Long, /*2*/ step: kotlin.Long) + @kotlin.Deprecated(message = "Use 'last' property instead.") public open override /*1*/ val end: kotlin.Long + public open override /*1*/ fun (): kotlin.Long + public final val first: kotlin.Long + public final fun (): kotlin.Long + @kotlin.Deprecated(message = "Use 'step' property instead.", replaceWith = kotlin.ReplaceWith(expression = "step", imports = {})) public open override /*1*/ val increment: kotlin.Long + public open override /*1*/ fun (): kotlin.Long + public final val last: kotlin.Long + public final fun (): kotlin.Long + @kotlin.Deprecated(message = "Use 'first' property instead.", replaceWith = kotlin.ReplaceWith(expression = "first", imports = {})) public open override /*1*/ val start: kotlin.Long + public open override /*1*/ fun (): kotlin.Long + public final val step: kotlin.Long + public final fun (): kotlin.Long + public open fun isEmpty(): kotlin.Boolean + public open override /*1*/ fun iterator(): kotlin.collections.LongIterator + + public companion object Companion { + /*primary*/ private constructor Companion() + public final fun fromClosedRange(/*0*/ rangeStart: kotlin.Long, /*1*/ rangeEnd: kotlin.Long, /*2*/ step: kotlin.Long): kotlin.ranges.LongProgression + } +} + +internal final class LongProgressionIterator : kotlin.collections.LongIterator { + /*primary*/ public constructor LongProgressionIterator(/*0*/ first: kotlin.Long, /*1*/ last: kotlin.Long, /*2*/ step: kotlin.Long) + private final val finalElement: kotlin.Long + private final fun (): kotlin.Long + private final var hasNext: kotlin.Boolean + private final fun (): kotlin.Boolean + private final fun (/*0*/ : kotlin.Boolean): kotlin.Unit + private final var next: kotlin.Long + private final fun (): kotlin.Long + private final fun (/*0*/ : kotlin.Long): kotlin.Unit + public final val step: kotlin.Long + public final fun (): kotlin.Long + public open override /*1*/ fun hasNext(): kotlin.Boolean + public final override /*1*/ /*fake_override*/ fun next(): kotlin.Long + public open override /*1*/ fun nextLong(): kotlin.Long +} + +public final class LongRange : kotlin.ranges.LongProgression, kotlin.ranges.ClosedRange { + /*primary*/ public constructor LongRange(/*0*/ start: kotlin.Long, /*1*/ endInclusive: kotlin.Long) + @kotlin.Deprecated(message = "Use endInclusive instead.", replaceWith = kotlin.ReplaceWith(expression = "endInclusive", imports = {})) public open override /*2*/ val end: kotlin.Long + public open override /*2*/ fun (): kotlin.Long + public open override /*1*/ val endInclusive: kotlin.Long + public open override /*1*/ fun (): kotlin.Long + public final override /*1*/ /*fake_override*/ val first: kotlin.Long + public final override /*1*/ /*fake_override*/ fun (): kotlin.Long + @kotlin.Deprecated(message = "Use 'step' property instead.", replaceWith = kotlin.ReplaceWith(expression = "step", imports = {})) public open override /*1*/ /*fake_override*/ val increment: kotlin.Long + public open override /*1*/ /*fake_override*/ fun (): kotlin.Long + public final override /*1*/ /*fake_override*/ val last: kotlin.Long + public final override /*1*/ /*fake_override*/ fun (): kotlin.Long + public open override /*2*/ val start: kotlin.Long + public open override /*2*/ fun (): kotlin.Long + public final override /*1*/ /*fake_override*/ val step: kotlin.Long + public final override /*1*/ /*fake_override*/ fun (): kotlin.Long + public open override /*1*/ fun contains(/*0*/ value: kotlin.Long): kotlin.Boolean + public open override /*2*/ fun isEmpty(): kotlin.Boolean + public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.collections.LongIterator + + public companion object Companion { + /*primary*/ private constructor Companion() + public final val EMPTY: kotlin.ranges.LongRange + public final fun (): kotlin.ranges.LongRange + } +} + +@kotlin.Deprecated(message = "This range has unclear inclusiveness of end value. Use ClosedRange instead.", replaceWith = kotlin.ReplaceWith(expression = "ClosedRange", imports = {})) public interface Range> { + public abstract val end: T + public abstract fun (): T + public abstract val start: T + public abstract fun (): T + public abstract operator fun contains(/*0*/ value: T): kotlin.Boolean + public open fun isEmpty(): kotlin.Boolean +} + +@kotlin.Deprecated(level = DeprecationLevel.WARNING, message = "Use IntProgression instead.", replaceWith = kotlin.ReplaceWith(expression = "IntProgression", imports = {})) public open class ShortProgression : kotlin.Progression { + /*primary*/ @kotlin.Deprecated(message = "This constructor will become private soon. Use ShortProgression.fromClosedRange() instead.", replaceWith = kotlin.ReplaceWith(expression = "ShortProgression.fromClosedRange(start, endInclusive, step)", imports = {})) public constructor ShortProgression(/*0*/ start: kotlin.Short, /*1*/ endInclusive: kotlin.Short, /*2*/ step: kotlin.Int) + @kotlin.Deprecated(message = "Use 'last' property instead.") public open override /*1*/ val end: kotlin.Short + public open override /*1*/ fun (): kotlin.Short + public final val first: kotlin.Short + public final fun (): kotlin.Short + @kotlin.Deprecated(message = "Use 'step' property instead.", replaceWith = kotlin.ReplaceWith(expression = "step", imports = {})) public open override /*1*/ val increment: kotlin.Int + public open override /*1*/ fun (): kotlin.Int + public final val last: kotlin.Short + public final fun (): kotlin.Short + @kotlin.Deprecated(message = "Use 'first' property instead.", replaceWith = kotlin.ReplaceWith(expression = "first", imports = {})) public open override /*1*/ val start: kotlin.Short + public open override /*1*/ fun (): kotlin.Short + public final val step: kotlin.Int + public final fun (): kotlin.Int + public open fun isEmpty(): kotlin.Boolean + public open override /*1*/ fun iterator(): kotlin.collections.ShortIterator + + public companion object Companion { + /*primary*/ private constructor Companion() + public final fun fromClosedRange(/*0*/ rangeStart: kotlin.Short, /*1*/ rangeEnd: kotlin.Short, /*2*/ step: kotlin.Int): kotlin.ranges.ShortProgression + } +} + +internal final class ShortProgressionIterator : kotlin.collections.ShortIterator { + /*primary*/ public constructor ShortProgressionIterator(/*0*/ first: kotlin.Short, /*1*/ last: kotlin.Short, /*2*/ step: kotlin.Int) + private final val finalElement: kotlin.Int + private final fun (): kotlin.Int + private final var hasNext: kotlin.Boolean + private final fun (): kotlin.Boolean + private final fun (/*0*/ : kotlin.Boolean): kotlin.Unit + private final var next: kotlin.Int + private final fun (): kotlin.Int + private final fun (/*0*/ : kotlin.Int): kotlin.Unit + public final val step: kotlin.Int + public final fun (): kotlin.Int + public open override /*1*/ fun hasNext(): kotlin.Boolean + public final override /*1*/ /*fake_override*/ fun next(): kotlin.Short + public open override /*1*/ fun nextShort(): kotlin.Short +} + +@kotlin.Deprecated(level = DeprecationLevel.WARNING, message = "Use IntRange instead.", replaceWith = kotlin.ReplaceWith(expression = "IntRange", imports = {})) public final class ShortRange : kotlin.ranges.ShortProgression, kotlin.ranges.ClosedRange { + /*primary*/ public constructor ShortRange(/*0*/ start: kotlin.Short, /*1*/ endInclusive: kotlin.Short) + @kotlin.Deprecated(message = "Use endInclusive instead.", replaceWith = kotlin.ReplaceWith(expression = "endInclusive", imports = {})) public open override /*2*/ val end: kotlin.Short + public open override /*2*/ fun (): kotlin.Short + public open override /*1*/ val endInclusive: kotlin.Short + public open override /*1*/ fun (): kotlin.Short + public final override /*1*/ /*fake_override*/ val first: kotlin.Short + public final override /*1*/ /*fake_override*/ fun (): kotlin.Short + @kotlin.Deprecated(message = "Use 'step' property instead.", replaceWith = kotlin.ReplaceWith(expression = "step", imports = {})) public open override /*1*/ /*fake_override*/ val increment: kotlin.Int + public open override /*1*/ /*fake_override*/ fun (): kotlin.Int + public final override /*1*/ /*fake_override*/ val last: kotlin.Short + public final override /*1*/ /*fake_override*/ fun (): kotlin.Short + public open override /*2*/ val start: kotlin.Short + public open override /*2*/ fun (): kotlin.Short + public final override /*1*/ /*fake_override*/ val step: kotlin.Int + public final override /*1*/ /*fake_override*/ fun (): kotlin.Int + public open override /*1*/ fun contains(/*0*/ value: kotlin.Short): kotlin.Boolean + public open override /*2*/ fun isEmpty(): kotlin.Boolean + public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.collections.ShortIterator + + public companion object Companion { + /*primary*/ private constructor Companion() + public final val EMPTY: kotlin.ranges.ShortRange + public final fun (): kotlin.ranges.ShortRange + } +} diff --git a/compiler/testData/builtin-classes.txt b/compiler/testData/builtin-classes-kotlin.txt similarity index 52% rename from compiler/testData/builtin-classes.txt rename to compiler/testData/builtin-classes-kotlin.txt index f00d52e93d9..c13574b3efb 100644 --- a/compiler/testData/builtin-classes.txt +++ b/compiler/testData/builtin-classes-kotlin.txt @@ -37,7 +37,7 @@ public final class Array : kotlin.Cloneable { public final fun (): kotlin.Int public open override /*1*/ fun clone(): kotlin.Array public final operator fun get(/*0*/ index: kotlin.Int): T - public final operator fun iterator(): kotlin.Iterator + public final operator fun iterator(): kotlin.collections.Iterator public final operator fun set(/*0*/ index: kotlin.Int, /*1*/ value: T): kotlin.Unit } @@ -56,17 +56,10 @@ public final class BooleanArray : kotlin.Cloneable { public final fun (): kotlin.Int public open override /*1*/ fun clone(): kotlin.BooleanArray public final operator fun get(/*0*/ index: kotlin.Int): kotlin.Boolean - public final operator fun iterator(): kotlin.BooleanIterator + public final operator fun iterator(): kotlin.collections.BooleanIterator public final operator fun set(/*0*/ index: kotlin.Int, /*1*/ value: kotlin.Boolean): kotlin.Unit } -public abstract class BooleanIterator : kotlin.Iterator { - /*primary*/ public constructor BooleanIterator() - public abstract override /*1*/ /*fake_override*/ fun hasNext(): kotlin.Boolean - public final override /*1*/ fun next(): kotlin.Boolean - public abstract fun nextBoolean(): kotlin.Boolean -} - public final class Byte : kotlin.Number, kotlin.Comparable { /*primary*/ private constructor Byte() public open override /*1*/ fun compareTo(/*0*/ other: kotlin.Byte): kotlin.Int @@ -101,10 +94,10 @@ public final class Byte : kotlin.Number, kotlin.Comparable { public final operator fun plus(/*0*/ other: kotlin.Int): kotlin.Int public final operator fun plus(/*0*/ other: kotlin.Long): kotlin.Long public final operator fun plus(/*0*/ other: kotlin.Short): kotlin.Int - public final operator fun rangeTo(/*0*/ other: kotlin.Byte): kotlin.IntRange - public final operator fun rangeTo(/*0*/ other: kotlin.Int): kotlin.IntRange - public final operator fun rangeTo(/*0*/ other: kotlin.Long): kotlin.LongRange - public final operator fun rangeTo(/*0*/ other: kotlin.Short): kotlin.IntRange + public final operator fun rangeTo(/*0*/ other: kotlin.Byte): kotlin.ranges.IntRange + public final operator fun rangeTo(/*0*/ other: kotlin.Int): kotlin.ranges.IntRange + public final operator fun rangeTo(/*0*/ other: kotlin.Long): kotlin.ranges.LongRange + public final operator fun rangeTo(/*0*/ other: kotlin.Short): kotlin.ranges.IntRange public final operator fun times(/*0*/ other: kotlin.Byte): kotlin.Int public final operator fun times(/*0*/ other: kotlin.Double): kotlin.Double public final operator fun times(/*0*/ other: kotlin.Float): kotlin.Float @@ -136,84 +129,10 @@ public final class ByteArray : kotlin.Cloneable { public final fun (): kotlin.Int public open override /*1*/ fun clone(): kotlin.ByteArray public final operator fun get(/*0*/ index: kotlin.Int): kotlin.Byte - public final operator fun iterator(): kotlin.ByteIterator + public final operator fun iterator(): kotlin.collections.ByteIterator public final operator fun set(/*0*/ index: kotlin.Int, /*1*/ value: kotlin.Byte): kotlin.Unit } -public abstract class ByteIterator : kotlin.Iterator { - /*primary*/ public constructor ByteIterator() - public abstract override /*1*/ /*fake_override*/ fun hasNext(): kotlin.Boolean - public final override /*1*/ fun next(): kotlin.Byte - public abstract fun nextByte(): kotlin.Byte -} - -@kotlin.Deprecated(level = DeprecationLevel.WARNING, message = "Use IntProgression instead.", replaceWith = kotlin.ReplaceWith(expression = "IntProgression", imports = {})) public open class ByteProgression : kotlin.Progression { - /*primary*/ @kotlin.Deprecated(message = "This constructor will become private soon. Use ByteProgression.fromClosedRange() instead.", replaceWith = kotlin.ReplaceWith(expression = "ByteProgression.fromClosedRange(start, endInclusive, step)", imports = {})) public constructor ByteProgression(/*0*/ start: kotlin.Byte, /*1*/ endInclusive: kotlin.Byte, /*2*/ step: kotlin.Int) - @kotlin.Deprecated(message = "Use 'last' property instead.") public open override /*1*/ val end: kotlin.Byte - public open override /*1*/ fun (): kotlin.Byte - public final val first: kotlin.Byte - public final fun (): kotlin.Byte - @kotlin.Deprecated(message = "Use 'step' property instead.", replaceWith = kotlin.ReplaceWith(expression = "step", imports = {})) public open override /*1*/ val increment: kotlin.Int - public open override /*1*/ fun (): kotlin.Int - public final val last: kotlin.Byte - public final fun (): kotlin.Byte - @kotlin.Deprecated(message = "Use 'first' property instead.", replaceWith = kotlin.ReplaceWith(expression = "first", imports = {})) public open override /*1*/ val start: kotlin.Byte - public open override /*1*/ fun (): kotlin.Byte - public final val step: kotlin.Int - public final fun (): kotlin.Int - public open fun isEmpty(): kotlin.Boolean - public open override /*1*/ fun iterator(): kotlin.ByteIterator - - public companion object Companion { - /*primary*/ private constructor Companion() - public final fun fromClosedRange(/*0*/ rangeStart: kotlin.Byte, /*1*/ rangeEnd: kotlin.Byte, /*2*/ step: kotlin.Int): kotlin.ByteProgression - } -} - -internal final class ByteProgressionIterator : kotlin.ByteIterator { - /*primary*/ public constructor ByteProgressionIterator(/*0*/ first: kotlin.Byte, /*1*/ last: kotlin.Byte, /*2*/ step: kotlin.Int) - private final val finalElement: kotlin.Int - private final fun (): kotlin.Int - private final var hasNext: kotlin.Boolean - private final fun (): kotlin.Boolean - private final fun (/*0*/ : kotlin.Boolean): kotlin.Unit - private final var next: kotlin.Int - private final fun (): kotlin.Int - private final fun (/*0*/ : kotlin.Int): kotlin.Unit - public final val step: kotlin.Int - public final fun (): kotlin.Int - public open override /*1*/ fun hasNext(): kotlin.Boolean - public final override /*1*/ /*fake_override*/ fun next(): kotlin.Byte - public open override /*1*/ fun nextByte(): kotlin.Byte -} - -@kotlin.Deprecated(level = DeprecationLevel.WARNING, message = "Use IntRange instead.", replaceWith = kotlin.ReplaceWith(expression = "IntRange", imports = {})) public final class ByteRange : kotlin.ByteProgression, kotlin.ClosedRange { - /*primary*/ public constructor ByteRange(/*0*/ start: kotlin.Byte, /*1*/ endInclusive: kotlin.Byte) - @kotlin.Deprecated(message = "Use endInclusive instead.", replaceWith = kotlin.ReplaceWith(expression = "endInclusive", imports = {})) public open override /*2*/ val end: kotlin.Byte - public open override /*2*/ fun (): kotlin.Byte - public open override /*1*/ val endInclusive: kotlin.Byte - public open override /*1*/ fun (): kotlin.Byte - public final override /*1*/ /*fake_override*/ val first: kotlin.Byte - public final override /*1*/ /*fake_override*/ fun (): kotlin.Byte - @kotlin.Deprecated(message = "Use 'step' property instead.", replaceWith = kotlin.ReplaceWith(expression = "step", imports = {})) public open override /*1*/ /*fake_override*/ val increment: kotlin.Int - public open override /*1*/ /*fake_override*/ fun (): kotlin.Int - public final override /*1*/ /*fake_override*/ val last: kotlin.Byte - public final override /*1*/ /*fake_override*/ fun (): kotlin.Byte - public open override /*2*/ val start: kotlin.Byte - public open override /*2*/ fun (): kotlin.Byte - public final override /*1*/ /*fake_override*/ val step: kotlin.Int - public final override /*1*/ /*fake_override*/ fun (): kotlin.Int - public open override /*1*/ fun contains(/*0*/ value: kotlin.Byte): kotlin.Boolean - public open override /*2*/ fun isEmpty(): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.ByteIterator - - public companion object Companion { - /*primary*/ private constructor Companion() - public final val EMPTY: kotlin.ByteRange - public final fun (): kotlin.ByteRange - } -} - public final class Char : kotlin.Comparable { /*primary*/ private constructor Char() public open override /*1*/ fun compareTo(/*0*/ other: kotlin.Char): kotlin.Int @@ -222,7 +141,7 @@ public final class Char : kotlin.Comparable { public final operator fun minus(/*0*/ other: kotlin.Char): kotlin.Int public final operator fun minus(/*0*/ other: kotlin.Int): kotlin.Char public final operator fun plus(/*0*/ other: kotlin.Int): kotlin.Char - public final operator fun rangeTo(/*0*/ other: kotlin.Char): kotlin.CharRange + public final operator fun rangeTo(/*0*/ other: kotlin.Char): kotlin.ranges.CharRange public open fun toByte(): kotlin.Byte public open fun toChar(): kotlin.Char public open fun toDouble(): kotlin.Double @@ -254,84 +173,10 @@ public final class CharArray : kotlin.Cloneable { public final fun (): kotlin.Int public open override /*1*/ fun clone(): kotlin.CharArray public final operator fun get(/*0*/ index: kotlin.Int): kotlin.Char - public final operator fun iterator(): kotlin.CharIterator + public final operator fun iterator(): kotlin.collections.CharIterator public final operator fun set(/*0*/ index: kotlin.Int, /*1*/ value: kotlin.Char): kotlin.Unit } -public abstract class CharIterator : kotlin.Iterator { - /*primary*/ public constructor CharIterator() - public abstract override /*1*/ /*fake_override*/ fun hasNext(): kotlin.Boolean - public final override /*1*/ fun next(): kotlin.Char - public abstract fun nextChar(): kotlin.Char -} - -public open class CharProgression : kotlin.Progression { - /*primary*/ @kotlin.Deprecated(message = "This constructor will become private soon. Use CharProgression.fromClosedRange() instead.", replaceWith = kotlin.ReplaceWith(expression = "CharProgression.fromClosedRange(start, endInclusive, step)", imports = {})) public constructor CharProgression(/*0*/ start: kotlin.Char, /*1*/ endInclusive: kotlin.Char, /*2*/ step: kotlin.Int) - @kotlin.Deprecated(message = "Use 'last' property instead.") public open override /*1*/ val end: kotlin.Char - public open override /*1*/ fun (): kotlin.Char - public final val first: kotlin.Char - public final fun (): kotlin.Char - @kotlin.Deprecated(message = "Use 'step' property instead.", replaceWith = kotlin.ReplaceWith(expression = "step", imports = {})) public open override /*1*/ val increment: kotlin.Int - public open override /*1*/ fun (): kotlin.Int - public final val last: kotlin.Char - public final fun (): kotlin.Char - @kotlin.Deprecated(message = "Use 'first' property instead.", replaceWith = kotlin.ReplaceWith(expression = "first", imports = {})) public open override /*1*/ val start: kotlin.Char - public open override /*1*/ fun (): kotlin.Char - public final val step: kotlin.Int - public final fun (): kotlin.Int - public open fun isEmpty(): kotlin.Boolean - public open override /*1*/ fun iterator(): kotlin.CharIterator - - public companion object Companion { - /*primary*/ private constructor Companion() - public final fun fromClosedRange(/*0*/ rangeStart: kotlin.Char, /*1*/ rangeEnd: kotlin.Char, /*2*/ step: kotlin.Int): kotlin.CharProgression - } -} - -internal final class CharProgressionIterator : kotlin.CharIterator { - /*primary*/ public constructor CharProgressionIterator(/*0*/ first: kotlin.Char, /*1*/ last: kotlin.Char, /*2*/ step: kotlin.Int) - private final val finalElement: kotlin.Int - private final fun (): kotlin.Int - private final var hasNext: kotlin.Boolean - private final fun (): kotlin.Boolean - private final fun (/*0*/ : kotlin.Boolean): kotlin.Unit - private final var next: kotlin.Int - private final fun (): kotlin.Int - private final fun (/*0*/ : kotlin.Int): kotlin.Unit - public final val step: kotlin.Int - public final fun (): kotlin.Int - public open override /*1*/ fun hasNext(): kotlin.Boolean - public final override /*1*/ /*fake_override*/ fun next(): kotlin.Char - public open override /*1*/ fun nextChar(): kotlin.Char -} - -public final class CharRange : kotlin.CharProgression, kotlin.ClosedRange { - /*primary*/ public constructor CharRange(/*0*/ start: kotlin.Char, /*1*/ endInclusive: kotlin.Char) - @kotlin.Deprecated(message = "Use endInclusive instead.", replaceWith = kotlin.ReplaceWith(expression = "endInclusive", imports = {})) public open override /*2*/ val end: kotlin.Char - public open override /*2*/ fun (): kotlin.Char - public open override /*1*/ val endInclusive: kotlin.Char - public open override /*1*/ fun (): kotlin.Char - public final override /*1*/ /*fake_override*/ val first: kotlin.Char - public final override /*1*/ /*fake_override*/ fun (): kotlin.Char - @kotlin.Deprecated(message = "Use 'step' property instead.", replaceWith = kotlin.ReplaceWith(expression = "step", imports = {})) public open override /*1*/ /*fake_override*/ val increment: kotlin.Int - public open override /*1*/ /*fake_override*/ fun (): kotlin.Int - public final override /*1*/ /*fake_override*/ val last: kotlin.Char - public final override /*1*/ /*fake_override*/ fun (): kotlin.Char - public open override /*2*/ val start: kotlin.Char - public open override /*2*/ fun (): kotlin.Char - public final override /*1*/ /*fake_override*/ val step: kotlin.Int - public final override /*1*/ /*fake_override*/ fun (): kotlin.Int - public open override /*1*/ fun contains(/*0*/ value: kotlin.Char): kotlin.Boolean - public open override /*2*/ fun isEmpty(): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.CharIterator - - public companion object Companion { - /*primary*/ private constructor Companion() - public final val EMPTY: kotlin.CharRange - public final fun (): kotlin.CharRange - } -} - public interface CharSequence { public abstract val length: kotlin.Int public abstract fun (): kotlin.Int @@ -343,26 +188,6 @@ public interface Cloneable { protected open fun clone(): kotlin.Any } -public interface ClosedRange> : kotlin.Range { - @kotlin.Deprecated(message = "Use endInclusive instead.", replaceWith = kotlin.ReplaceWith(expression = "endInclusive", imports = {})) public open override /*1*/ val end: T - public open override /*1*/ fun (): T - public abstract val endInclusive: T - public abstract fun (): T - public abstract override /*1*/ val start: T - public abstract override /*1*/ fun (): T - public open override /*1*/ fun contains(/*0*/ value: T): kotlin.Boolean - public open override /*1*/ fun isEmpty(): kotlin.Boolean -} - -public interface Collection : kotlin.Iterable { - public abstract val size: kotlin.Int - public abstract fun (): kotlin.Int - public abstract operator fun contains(/*0*/ element: @kotlin.UnsafeVariance() E): kotlin.Boolean - public abstract fun containsAll(/*0*/ elements: kotlin.Collection<@kotlin.UnsafeVariance() E>): kotlin.Boolean - public abstract fun isEmpty(): kotlin.Boolean - public abstract override /*1*/ fun iterator(): kotlin.Iterator -} - public interface Comparable { public abstract operator fun compareTo(/*0*/ other: T): kotlin.Int } @@ -470,17 +295,10 @@ public final class DoubleArray : kotlin.Cloneable { public final fun (): kotlin.Int public open override /*1*/ fun clone(): kotlin.DoubleArray public final operator fun get(/*0*/ index: kotlin.Int): kotlin.Double - public final operator fun iterator(): kotlin.DoubleIterator + public final operator fun iterator(): kotlin.collections.DoubleIterator public final operator fun set(/*0*/ index: kotlin.Int, /*1*/ value: kotlin.Double): kotlin.Unit } -public abstract class DoubleIterator : kotlin.Iterator { - /*primary*/ public constructor DoubleIterator() - public abstract override /*1*/ /*fake_override*/ fun hasNext(): kotlin.Boolean - public final override /*1*/ fun next(): kotlin.Double - public abstract fun nextDouble(): kotlin.Double -} - public abstract class Enum> : kotlin.Comparable { /*primary*/ public constructor Enum>(/*0*/ name: kotlin.String, /*1*/ ordinal: kotlin.Int) public final val name: kotlin.String @@ -574,17 +392,10 @@ public final class FloatArray : kotlin.Cloneable { public final fun (): kotlin.Int public open override /*1*/ fun clone(): kotlin.FloatArray public final operator fun get(/*0*/ index: kotlin.Int): kotlin.Float - public final operator fun iterator(): kotlin.FloatIterator + public final operator fun iterator(): kotlin.collections.FloatIterator public final operator fun set(/*0*/ index: kotlin.Int, /*1*/ value: kotlin.Float): kotlin.Unit } -public abstract class FloatIterator : kotlin.Iterator { - /*primary*/ public constructor FloatIterator() - public abstract override /*1*/ /*fake_override*/ fun hasNext(): kotlin.Boolean - public final override /*1*/ fun next(): kotlin.Float - public abstract fun nextFloat(): kotlin.Float -} - public interface Function { } @@ -629,10 +440,10 @@ public final class Int : kotlin.Number, kotlin.Comparable { public final operator fun plus(/*0*/ other: kotlin.Int): kotlin.Int public final operator fun plus(/*0*/ other: kotlin.Long): kotlin.Long public final operator fun plus(/*0*/ other: kotlin.Short): kotlin.Int - public final operator fun rangeTo(/*0*/ other: kotlin.Byte): kotlin.IntRange - public final operator fun rangeTo(/*0*/ other: kotlin.Int): kotlin.IntRange - public final operator fun rangeTo(/*0*/ other: kotlin.Long): kotlin.LongRange - public final operator fun rangeTo(/*0*/ other: kotlin.Short): kotlin.IntRange + public final operator fun rangeTo(/*0*/ other: kotlin.Byte): kotlin.ranges.IntRange + public final operator fun rangeTo(/*0*/ other: kotlin.Int): kotlin.ranges.IntRange + public final operator fun rangeTo(/*0*/ other: kotlin.Long): kotlin.ranges.LongRange + public final operator fun rangeTo(/*0*/ other: kotlin.Short): kotlin.ranges.IntRange public final infix fun shl(/*0*/ bitCount: kotlin.Int): kotlin.Int public final infix fun shr(/*0*/ bitCount: kotlin.Int): kotlin.Int public final operator fun times(/*0*/ other: kotlin.Byte): kotlin.Int @@ -668,117 +479,10 @@ public final class IntArray : kotlin.Cloneable { public final fun (): kotlin.Int public open override /*1*/ fun clone(): kotlin.IntArray public final operator fun get(/*0*/ index: kotlin.Int): kotlin.Int - public final operator fun iterator(): kotlin.IntIterator + public final operator fun iterator(): kotlin.collections.IntIterator public final operator fun set(/*0*/ index: kotlin.Int, /*1*/ value: kotlin.Int): kotlin.Unit } -public abstract class IntIterator : kotlin.Iterator { - /*primary*/ public constructor IntIterator() - public abstract override /*1*/ /*fake_override*/ fun hasNext(): kotlin.Boolean - public final override /*1*/ fun next(): kotlin.Int - public abstract fun nextInt(): kotlin.Int -} - -public open class IntProgression : kotlin.Progression { - /*primary*/ @kotlin.Deprecated(message = "This constructor will become private soon. Use IntProgression.fromClosedRange() instead.", replaceWith = kotlin.ReplaceWith(expression = "IntProgression.fromClosedRange(start, endInclusive, step)", imports = {})) public constructor IntProgression(/*0*/ start: kotlin.Int, /*1*/ endInclusive: kotlin.Int, /*2*/ step: kotlin.Int) - @kotlin.Deprecated(message = "Use 'last' property instead.") public open override /*1*/ val end: kotlin.Int - public open override /*1*/ fun (): kotlin.Int - public final val first: kotlin.Int - public final fun (): kotlin.Int - @kotlin.Deprecated(message = "Use 'step' property instead.", replaceWith = kotlin.ReplaceWith(expression = "step", imports = {})) public open override /*1*/ val increment: kotlin.Int - public open override /*1*/ fun (): kotlin.Int - public final val last: kotlin.Int - public final fun (): kotlin.Int - @kotlin.Deprecated(message = "Use 'first' property instead.", replaceWith = kotlin.ReplaceWith(expression = "first", imports = {})) public open override /*1*/ val start: kotlin.Int - public open override /*1*/ fun (): kotlin.Int - public final val step: kotlin.Int - public final fun (): kotlin.Int - public open fun isEmpty(): kotlin.Boolean - public open override /*1*/ fun iterator(): kotlin.IntIterator - - public companion object Companion { - /*primary*/ private constructor Companion() - public final fun fromClosedRange(/*0*/ rangeStart: kotlin.Int, /*1*/ rangeEnd: kotlin.Int, /*2*/ step: kotlin.Int): kotlin.IntProgression - } -} - -internal final class IntProgressionIterator : kotlin.IntIterator { - /*primary*/ public constructor IntProgressionIterator(/*0*/ first: kotlin.Int, /*1*/ last: kotlin.Int, /*2*/ step: kotlin.Int) - private final val finalElement: kotlin.Int - private final fun (): kotlin.Int - private final var hasNext: kotlin.Boolean - private final fun (): kotlin.Boolean - private final fun (/*0*/ : kotlin.Boolean): kotlin.Unit - private final var next: kotlin.Int - private final fun (): kotlin.Int - private final fun (/*0*/ : kotlin.Int): kotlin.Unit - public final val step: kotlin.Int - public final fun (): kotlin.Int - public open override /*1*/ fun hasNext(): kotlin.Boolean - public final override /*1*/ /*fake_override*/ fun next(): kotlin.Int - public open override /*1*/ fun nextInt(): kotlin.Int -} - -public final class IntRange : kotlin.IntProgression, kotlin.ClosedRange { - /*primary*/ public constructor IntRange(/*0*/ start: kotlin.Int, /*1*/ endInclusive: kotlin.Int) - @kotlin.Deprecated(message = "Use endInclusive instead.", replaceWith = kotlin.ReplaceWith(expression = "endInclusive", imports = {})) public open override /*2*/ val end: kotlin.Int - public open override /*2*/ fun (): kotlin.Int - public open override /*1*/ val endInclusive: kotlin.Int - public open override /*1*/ fun (): kotlin.Int - public final override /*1*/ /*fake_override*/ val first: kotlin.Int - public final override /*1*/ /*fake_override*/ fun (): kotlin.Int - @kotlin.Deprecated(message = "Use 'step' property instead.", replaceWith = kotlin.ReplaceWith(expression = "step", imports = {})) public open override /*1*/ /*fake_override*/ val increment: kotlin.Int - public open override /*1*/ /*fake_override*/ fun (): kotlin.Int - public final override /*1*/ /*fake_override*/ val last: kotlin.Int - public final override /*1*/ /*fake_override*/ fun (): kotlin.Int - public open override /*2*/ val start: kotlin.Int - public open override /*2*/ fun (): kotlin.Int - public final override /*1*/ /*fake_override*/ val step: kotlin.Int - public final override /*1*/ /*fake_override*/ fun (): kotlin.Int - public open override /*1*/ fun contains(/*0*/ value: kotlin.Int): kotlin.Boolean - public open override /*2*/ fun isEmpty(): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.IntIterator - - public companion object Companion { - /*primary*/ private constructor Companion() - public final val EMPTY: kotlin.IntRange - public final fun (): kotlin.IntRange - } -} - -public interface Iterable { - public abstract operator fun iterator(): kotlin.Iterator -} - -public interface Iterator { - public abstract operator fun hasNext(): kotlin.Boolean - public abstract operator fun next(): T -} - -public interface List : kotlin.Collection { - public abstract override /*1*/ val size: kotlin.Int - public abstract override /*1*/ fun (): kotlin.Int - public abstract override /*1*/ fun contains(/*0*/ element: @kotlin.UnsafeVariance() E): kotlin.Boolean - public abstract override /*1*/ fun containsAll(/*0*/ elements: kotlin.Collection<@kotlin.UnsafeVariance() E>): kotlin.Boolean - public abstract operator fun get(/*0*/ index: kotlin.Int): E - public abstract fun indexOf(/*0*/ element: @kotlin.UnsafeVariance() E): kotlin.Int - public abstract override /*1*/ fun isEmpty(): kotlin.Boolean - public abstract override /*1*/ fun iterator(): kotlin.Iterator - public abstract fun lastIndexOf(/*0*/ element: @kotlin.UnsafeVariance() E): kotlin.Int - public abstract fun listIterator(): kotlin.ListIterator - public abstract fun listIterator(/*0*/ index: kotlin.Int): kotlin.ListIterator - public abstract fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.List -} - -public interface ListIterator : kotlin.Iterator { - public abstract override /*1*/ fun hasNext(): kotlin.Boolean - public abstract fun hasPrevious(): kotlin.Boolean - public abstract override /*1*/ fun next(): T - public abstract fun nextIndex(): kotlin.Int - public abstract fun previous(): T - public abstract fun previousIndex(): kotlin.Int -} - public final class Long : kotlin.Number, kotlin.Comparable { /*primary*/ private constructor Long() public final infix fun and(/*0*/ other: kotlin.Long): kotlin.Long @@ -816,10 +520,10 @@ public final class Long : kotlin.Number, kotlin.Comparable { public final operator fun plus(/*0*/ other: kotlin.Int): kotlin.Long public final operator fun plus(/*0*/ other: kotlin.Long): kotlin.Long public final operator fun plus(/*0*/ other: kotlin.Short): kotlin.Long - public final operator fun rangeTo(/*0*/ other: kotlin.Byte): kotlin.LongRange - public final operator fun rangeTo(/*0*/ other: kotlin.Int): kotlin.LongRange - public final operator fun rangeTo(/*0*/ other: kotlin.Long): kotlin.LongRange - public final operator fun rangeTo(/*0*/ other: kotlin.Short): kotlin.LongRange + public final operator fun rangeTo(/*0*/ other: kotlin.Byte): kotlin.ranges.LongRange + public final operator fun rangeTo(/*0*/ other: kotlin.Int): kotlin.ranges.LongRange + public final operator fun rangeTo(/*0*/ other: kotlin.Long): kotlin.ranges.LongRange + public final operator fun rangeTo(/*0*/ other: kotlin.Short): kotlin.ranges.LongRange public final infix fun shl(/*0*/ bitCount: kotlin.Int): kotlin.Long public final infix fun shr(/*0*/ bitCount: kotlin.Int): kotlin.Long public final operator fun times(/*0*/ other: kotlin.Byte): kotlin.Long @@ -855,210 +559,10 @@ public final class LongArray : kotlin.Cloneable { public final fun (): kotlin.Int public open override /*1*/ fun clone(): kotlin.LongArray public final operator fun get(/*0*/ index: kotlin.Int): kotlin.Long - public final operator fun iterator(): kotlin.LongIterator + public final operator fun iterator(): kotlin.collections.LongIterator public final operator fun set(/*0*/ index: kotlin.Int, /*1*/ value: kotlin.Long): kotlin.Unit } -public abstract class LongIterator : kotlin.Iterator { - /*primary*/ public constructor LongIterator() - public abstract override /*1*/ /*fake_override*/ fun hasNext(): kotlin.Boolean - public final override /*1*/ fun next(): kotlin.Long - public abstract fun nextLong(): kotlin.Long -} - -public open class LongProgression : kotlin.Progression { - /*primary*/ @kotlin.Deprecated(message = "This constructor will become private soon. Use LongProgression.fromClosedRange() instead.", replaceWith = kotlin.ReplaceWith(expression = "LongProgression.fromClosedRange(start, endInclusive, step)", imports = {})) public constructor LongProgression(/*0*/ start: kotlin.Long, /*1*/ endInclusive: kotlin.Long, /*2*/ step: kotlin.Long) - @kotlin.Deprecated(message = "Use 'last' property instead.") public open override /*1*/ val end: kotlin.Long - public open override /*1*/ fun (): kotlin.Long - public final val first: kotlin.Long - public final fun (): kotlin.Long - @kotlin.Deprecated(message = "Use 'step' property instead.", replaceWith = kotlin.ReplaceWith(expression = "step", imports = {})) public open override /*1*/ val increment: kotlin.Long - public open override /*1*/ fun (): kotlin.Long - public final val last: kotlin.Long - public final fun (): kotlin.Long - @kotlin.Deprecated(message = "Use 'first' property instead.", replaceWith = kotlin.ReplaceWith(expression = "first", imports = {})) public open override /*1*/ val start: kotlin.Long - public open override /*1*/ fun (): kotlin.Long - public final val step: kotlin.Long - public final fun (): kotlin.Long - public open fun isEmpty(): kotlin.Boolean - public open override /*1*/ fun iterator(): kotlin.LongIterator - - public companion object Companion { - /*primary*/ private constructor Companion() - public final fun fromClosedRange(/*0*/ rangeStart: kotlin.Long, /*1*/ rangeEnd: kotlin.Long, /*2*/ step: kotlin.Long): kotlin.LongProgression - } -} - -internal final class LongProgressionIterator : kotlin.LongIterator { - /*primary*/ public constructor LongProgressionIterator(/*0*/ first: kotlin.Long, /*1*/ last: kotlin.Long, /*2*/ step: kotlin.Long) - private final val finalElement: kotlin.Long - private final fun (): kotlin.Long - private final var hasNext: kotlin.Boolean - private final fun (): kotlin.Boolean - private final fun (/*0*/ : kotlin.Boolean): kotlin.Unit - private final var next: kotlin.Long - private final fun (): kotlin.Long - private final fun (/*0*/ : kotlin.Long): kotlin.Unit - public final val step: kotlin.Long - public final fun (): kotlin.Long - public open override /*1*/ fun hasNext(): kotlin.Boolean - public final override /*1*/ /*fake_override*/ fun next(): kotlin.Long - public open override /*1*/ fun nextLong(): kotlin.Long -} - -public final class LongRange : kotlin.LongProgression, kotlin.ClosedRange { - /*primary*/ public constructor LongRange(/*0*/ start: kotlin.Long, /*1*/ endInclusive: kotlin.Long) - @kotlin.Deprecated(message = "Use endInclusive instead.", replaceWith = kotlin.ReplaceWith(expression = "endInclusive", imports = {})) public open override /*2*/ val end: kotlin.Long - public open override /*2*/ fun (): kotlin.Long - public open override /*1*/ val endInclusive: kotlin.Long - public open override /*1*/ fun (): kotlin.Long - public final override /*1*/ /*fake_override*/ val first: kotlin.Long - public final override /*1*/ /*fake_override*/ fun (): kotlin.Long - @kotlin.Deprecated(message = "Use 'step' property instead.", replaceWith = kotlin.ReplaceWith(expression = "step", imports = {})) public open override /*1*/ /*fake_override*/ val increment: kotlin.Long - public open override /*1*/ /*fake_override*/ fun (): kotlin.Long - public final override /*1*/ /*fake_override*/ val last: kotlin.Long - public final override /*1*/ /*fake_override*/ fun (): kotlin.Long - public open override /*2*/ val start: kotlin.Long - public open override /*2*/ fun (): kotlin.Long - public final override /*1*/ /*fake_override*/ val step: kotlin.Long - public final override /*1*/ /*fake_override*/ fun (): kotlin.Long - public open override /*1*/ fun contains(/*0*/ value: kotlin.Long): kotlin.Boolean - public open override /*2*/ fun isEmpty(): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.LongIterator - - public companion object Companion { - /*primary*/ private constructor Companion() - public final val EMPTY: kotlin.LongRange - public final fun (): kotlin.LongRange - } -} - -public interface Map { - public abstract val entries: kotlin.Set> - public abstract fun (): kotlin.Set> - public abstract val keys: kotlin.Set - public abstract fun (): kotlin.Set - public abstract val size: kotlin.Int - public abstract fun (): kotlin.Int - public abstract val values: kotlin.Collection - public abstract fun (): kotlin.Collection - public abstract fun containsKey(/*0*/ key: K): kotlin.Boolean - public abstract fun containsValue(/*0*/ value: @kotlin.UnsafeVariance() V): kotlin.Boolean - public abstract operator fun get(/*0*/ key: K): V? - public abstract fun isEmpty(): kotlin.Boolean - - public interface Entry { - public abstract val key: K - public abstract fun (): K - public abstract val value: V - public abstract fun (): V - } -} - -public interface MutableCollection : kotlin.Collection, kotlin.MutableIterable { - public abstract override /*1*/ /*fake_override*/ val size: kotlin.Int - public abstract override /*1*/ /*fake_override*/ fun (): kotlin.Int - public abstract fun add(/*0*/ element: E): kotlin.Boolean - public abstract fun addAll(/*0*/ elements: kotlin.Collection): kotlin.Boolean - public abstract fun clear(): kotlin.Unit - public abstract override /*1*/ /*fake_override*/ fun contains(/*0*/ element: E): kotlin.Boolean - public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.Collection): kotlin.Boolean - public abstract override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean - public abstract override /*2*/ fun iterator(): kotlin.MutableIterator - public abstract fun remove(/*0*/ element: E): kotlin.Boolean - public abstract fun removeAll(/*0*/ elements: kotlin.Collection): kotlin.Boolean - public abstract fun retainAll(/*0*/ elements: kotlin.Collection): kotlin.Boolean -} - -public interface MutableIterable : kotlin.Iterable { - public abstract override /*1*/ fun iterator(): kotlin.MutableIterator -} - -public interface MutableIterator : kotlin.Iterator { - public abstract override /*1*/ /*fake_override*/ fun hasNext(): kotlin.Boolean - public abstract override /*1*/ /*fake_override*/ fun next(): T - public abstract fun remove(): kotlin.Unit -} - -public interface MutableList : kotlin.List, kotlin.MutableCollection { - public abstract override /*2*/ /*fake_override*/ val size: kotlin.Int - public abstract override /*2*/ /*fake_override*/ fun (): kotlin.Int - public abstract override /*1*/ fun add(/*0*/ element: E): kotlin.Boolean - public abstract fun add(/*0*/ index: kotlin.Int, /*1*/ element: E): kotlin.Unit - public abstract override /*1*/ fun addAll(/*0*/ elements: kotlin.Collection): kotlin.Boolean - public abstract fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.Collection): kotlin.Boolean - public abstract override /*1*/ fun clear(): kotlin.Unit - public abstract override /*2*/ /*fake_override*/ fun contains(/*0*/ element: E): kotlin.Boolean - public abstract override /*2*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.Collection): kotlin.Boolean - public abstract override /*1*/ /*fake_override*/ fun get(/*0*/ index: kotlin.Int): E - public abstract override /*1*/ /*fake_override*/ fun indexOf(/*0*/ element: E): kotlin.Int - public abstract override /*2*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean - public abstract override /*2*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator - public abstract override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ element: E): kotlin.Int - public abstract override /*1*/ fun listIterator(): kotlin.MutableListIterator - public abstract override /*1*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.MutableListIterator - public abstract override /*1*/ fun remove(/*0*/ element: E): kotlin.Boolean - public abstract override /*1*/ fun removeAll(/*0*/ elements: kotlin.Collection): kotlin.Boolean - public abstract fun removeAt(/*0*/ index: kotlin.Int): E - public abstract override /*1*/ fun retainAll(/*0*/ elements: kotlin.Collection): kotlin.Boolean - public abstract operator fun set(/*0*/ index: kotlin.Int, /*1*/ element: E): E - public abstract override /*1*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.MutableList -} - -public interface MutableListIterator : kotlin.ListIterator, kotlin.MutableIterator { - public abstract fun add(/*0*/ element: T): kotlin.Unit - public abstract override /*2*/ fun hasNext(): kotlin.Boolean - public abstract override /*1*/ /*fake_override*/ fun hasPrevious(): kotlin.Boolean - public abstract override /*2*/ fun next(): T - public abstract override /*1*/ /*fake_override*/ fun nextIndex(): kotlin.Int - public abstract override /*1*/ /*fake_override*/ fun previous(): T - public abstract override /*1*/ /*fake_override*/ fun previousIndex(): kotlin.Int - public abstract override /*1*/ fun remove(): kotlin.Unit - public abstract fun set(/*0*/ element: T): kotlin.Unit -} - -public interface MutableMap : kotlin.Map { - public abstract override /*1*/ val entries: kotlin.MutableSet> - public abstract override /*1*/ fun (): kotlin.MutableSet> - public abstract override /*1*/ val keys: kotlin.MutableSet - public abstract override /*1*/ fun (): kotlin.MutableSet - public abstract override /*1*/ /*fake_override*/ val size: kotlin.Int - public abstract override /*1*/ /*fake_override*/ fun (): kotlin.Int - public abstract override /*1*/ val values: kotlin.MutableCollection - public abstract override /*1*/ fun (): kotlin.MutableCollection - public abstract fun clear(): kotlin.Unit - public abstract override /*1*/ /*fake_override*/ fun containsKey(/*0*/ key: K): kotlin.Boolean - public abstract override /*1*/ /*fake_override*/ fun containsValue(/*0*/ value: V): kotlin.Boolean - public abstract override /*1*/ /*fake_override*/ fun get(/*0*/ key: K): V? - public abstract override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean - public abstract fun put(/*0*/ key: K, /*1*/ value: V): V? - public abstract fun putAll(/*0*/ from: kotlin.Map): kotlin.Unit - public abstract fun remove(/*0*/ key: K): V? - - public interface MutableEntry : kotlin.Map.Entry { - public abstract override /*1*/ /*fake_override*/ val key: K - public abstract override /*1*/ /*fake_override*/ fun (): K - public abstract override /*1*/ /*fake_override*/ val value: V - public abstract override /*1*/ /*fake_override*/ fun (): V - public abstract fun setValue(/*0*/ newValue: V): V - } -} - -public interface MutableSet : kotlin.Set, kotlin.MutableCollection { - public abstract override /*2*/ /*fake_override*/ val size: kotlin.Int - public abstract override /*2*/ /*fake_override*/ fun (): kotlin.Int - public abstract override /*1*/ fun add(/*0*/ element: E): kotlin.Boolean - public abstract override /*1*/ fun addAll(/*0*/ elements: kotlin.Collection): kotlin.Boolean - public abstract override /*1*/ fun clear(): kotlin.Unit - public abstract override /*2*/ /*fake_override*/ fun contains(/*0*/ element: E): kotlin.Boolean - public abstract override /*2*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.Collection): kotlin.Boolean - public abstract override /*2*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean - public abstract override /*2*/ fun iterator(): kotlin.MutableIterator - public abstract override /*1*/ fun remove(/*0*/ element: E): kotlin.Boolean - public abstract override /*1*/ fun removeAll(/*0*/ elements: kotlin.Collection): kotlin.Boolean - public abstract override /*1*/ fun retainAll(/*0*/ elements: kotlin.Collection): kotlin.Boolean -} - public final class Nothing { /*primary*/ private constructor Nothing() } @@ -1074,14 +578,14 @@ public abstract class Number { public abstract fun toShort(): kotlin.Short } -@kotlin.Deprecated(message = "This generic progression interface is not of much use and will be removed soon. Use concrete progression implementation instead: IntProgression, LongProgression or CharProgression.") public interface Progression : kotlin.Iterable { +@kotlin.Deprecated(message = "This generic progression interface is not of much use and will be removed soon. Use concrete progression implementation instead: IntProgression, LongProgression or CharProgression.") public interface Progression : kotlin.collections.Iterable { public abstract val end: N public abstract fun (): N public abstract val increment: kotlin.Number public abstract fun (): kotlin.Number public abstract val start: N public abstract fun (): N - public abstract override /*1*/ /*fake_override*/ fun iterator(): kotlin.Iterator + public abstract override /*1*/ /*fake_override*/ fun iterator(): kotlin.collections.Iterator } @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Please use KProperty instead.", replaceWith = kotlin.ReplaceWith(expression = "KProperty<*>", imports = {"kotlin.reflect.KProperty"})) internal interface PropertyMetadata { @@ -1089,15 +593,6 @@ public abstract class Number { public abstract fun (): kotlin.String } -@kotlin.Deprecated(message = "This range has unclear inclusiveness of end value. Use ClosedRange instead.", replaceWith = kotlin.ReplaceWith(expression = "ClosedRange", imports = {})) public interface Range> { - public abstract val end: T - public abstract fun (): T - public abstract val start: T - public abstract fun (): T - public abstract operator fun contains(/*0*/ value: T): kotlin.Boolean - public open fun isEmpty(): kotlin.Boolean -} - @kotlin.annotation.Target(allowedTargets = {}) @kotlin.annotation.Retention(value = AnnotationRetention.BINARY) @kotlin.annotation.MustBeDocumented() public final annotation class ReplaceWith : kotlin.Annotation { /*primary*/ public constructor ReplaceWith(/*0*/ expression: kotlin.String, /*1*/ vararg imports: kotlin.String /*kotlin.Array*/) public final val expression: kotlin.String @@ -1106,15 +601,6 @@ public abstract class Number { public final fun (): kotlin.Array } -public interface Set : kotlin.Collection { - public abstract override /*1*/ val size: kotlin.Int - public abstract override /*1*/ fun (): kotlin.Int - public abstract override /*1*/ fun contains(/*0*/ element: @kotlin.UnsafeVariance() E): kotlin.Boolean - public abstract override /*1*/ fun containsAll(/*0*/ elements: kotlin.Collection<@kotlin.UnsafeVariance() E>): kotlin.Boolean - public abstract override /*1*/ fun isEmpty(): kotlin.Boolean - public abstract override /*1*/ fun iterator(): kotlin.Iterator -} - public final class Short : kotlin.Number, kotlin.Comparable { /*primary*/ private constructor Short() public final operator fun compareTo(/*0*/ other: kotlin.Byte): kotlin.Int @@ -1149,10 +635,10 @@ public final class Short : kotlin.Number, kotlin.Comparable { public final operator fun plus(/*0*/ other: kotlin.Int): kotlin.Int public final operator fun plus(/*0*/ other: kotlin.Long): kotlin.Long public final operator fun plus(/*0*/ other: kotlin.Short): kotlin.Int - public final operator fun rangeTo(/*0*/ other: kotlin.Byte): kotlin.IntRange - public final operator fun rangeTo(/*0*/ other: kotlin.Int): kotlin.IntRange - public final operator fun rangeTo(/*0*/ other: kotlin.Long): kotlin.LongRange - public final operator fun rangeTo(/*0*/ other: kotlin.Short): kotlin.IntRange + public final operator fun rangeTo(/*0*/ other: kotlin.Byte): kotlin.ranges.IntRange + public final operator fun rangeTo(/*0*/ other: kotlin.Int): kotlin.ranges.IntRange + public final operator fun rangeTo(/*0*/ other: kotlin.Long): kotlin.ranges.LongRange + public final operator fun rangeTo(/*0*/ other: kotlin.Short): kotlin.ranges.IntRange public final operator fun times(/*0*/ other: kotlin.Byte): kotlin.Int public final operator fun times(/*0*/ other: kotlin.Double): kotlin.Double public final operator fun times(/*0*/ other: kotlin.Float): kotlin.Float @@ -1184,84 +670,10 @@ public final class ShortArray : kotlin.Cloneable { public final fun (): kotlin.Int public open override /*1*/ fun clone(): kotlin.ShortArray public final operator fun get(/*0*/ index: kotlin.Int): kotlin.Short - public final operator fun iterator(): kotlin.ShortIterator + public final operator fun iterator(): kotlin.collections.ShortIterator public final operator fun set(/*0*/ index: kotlin.Int, /*1*/ value: kotlin.Short): kotlin.Unit } -public abstract class ShortIterator : kotlin.Iterator { - /*primary*/ public constructor ShortIterator() - public abstract override /*1*/ /*fake_override*/ fun hasNext(): kotlin.Boolean - public final override /*1*/ fun next(): kotlin.Short - public abstract fun nextShort(): kotlin.Short -} - -@kotlin.Deprecated(level = DeprecationLevel.WARNING, message = "Use IntProgression instead.", replaceWith = kotlin.ReplaceWith(expression = "IntProgression", imports = {})) public open class ShortProgression : kotlin.Progression { - /*primary*/ @kotlin.Deprecated(message = "This constructor will become private soon. Use ShortProgression.fromClosedRange() instead.", replaceWith = kotlin.ReplaceWith(expression = "ShortProgression.fromClosedRange(start, endInclusive, step)", imports = {})) public constructor ShortProgression(/*0*/ start: kotlin.Short, /*1*/ endInclusive: kotlin.Short, /*2*/ step: kotlin.Int) - @kotlin.Deprecated(message = "Use 'last' property instead.") public open override /*1*/ val end: kotlin.Short - public open override /*1*/ fun (): kotlin.Short - public final val first: kotlin.Short - public final fun (): kotlin.Short - @kotlin.Deprecated(message = "Use 'step' property instead.", replaceWith = kotlin.ReplaceWith(expression = "step", imports = {})) public open override /*1*/ val increment: kotlin.Int - public open override /*1*/ fun (): kotlin.Int - public final val last: kotlin.Short - public final fun (): kotlin.Short - @kotlin.Deprecated(message = "Use 'first' property instead.", replaceWith = kotlin.ReplaceWith(expression = "first", imports = {})) public open override /*1*/ val start: kotlin.Short - public open override /*1*/ fun (): kotlin.Short - public final val step: kotlin.Int - public final fun (): kotlin.Int - public open fun isEmpty(): kotlin.Boolean - public open override /*1*/ fun iterator(): kotlin.ShortIterator - - public companion object Companion { - /*primary*/ private constructor Companion() - public final fun fromClosedRange(/*0*/ rangeStart: kotlin.Short, /*1*/ rangeEnd: kotlin.Short, /*2*/ step: kotlin.Int): kotlin.ShortProgression - } -} - -internal final class ShortProgressionIterator : kotlin.ShortIterator { - /*primary*/ public constructor ShortProgressionIterator(/*0*/ first: kotlin.Short, /*1*/ last: kotlin.Short, /*2*/ step: kotlin.Int) - private final val finalElement: kotlin.Int - private final fun (): kotlin.Int - private final var hasNext: kotlin.Boolean - private final fun (): kotlin.Boolean - private final fun (/*0*/ : kotlin.Boolean): kotlin.Unit - private final var next: kotlin.Int - private final fun (): kotlin.Int - private final fun (/*0*/ : kotlin.Int): kotlin.Unit - public final val step: kotlin.Int - public final fun (): kotlin.Int - public open override /*1*/ fun hasNext(): kotlin.Boolean - public final override /*1*/ /*fake_override*/ fun next(): kotlin.Short - public open override /*1*/ fun nextShort(): kotlin.Short -} - -@kotlin.Deprecated(level = DeprecationLevel.WARNING, message = "Use IntRange instead.", replaceWith = kotlin.ReplaceWith(expression = "IntRange", imports = {})) public final class ShortRange : kotlin.ShortProgression, kotlin.ClosedRange { - /*primary*/ public constructor ShortRange(/*0*/ start: kotlin.Short, /*1*/ endInclusive: kotlin.Short) - @kotlin.Deprecated(message = "Use endInclusive instead.", replaceWith = kotlin.ReplaceWith(expression = "endInclusive", imports = {})) public open override /*2*/ val end: kotlin.Short - public open override /*2*/ fun (): kotlin.Short - public open override /*1*/ val endInclusive: kotlin.Short - public open override /*1*/ fun (): kotlin.Short - public final override /*1*/ /*fake_override*/ val first: kotlin.Short - public final override /*1*/ /*fake_override*/ fun (): kotlin.Short - @kotlin.Deprecated(message = "Use 'step' property instead.", replaceWith = kotlin.ReplaceWith(expression = "step", imports = {})) public open override /*1*/ /*fake_override*/ val increment: kotlin.Int - public open override /*1*/ /*fake_override*/ fun (): kotlin.Int - public final override /*1*/ /*fake_override*/ val last: kotlin.Short - public final override /*1*/ /*fake_override*/ fun (): kotlin.Short - public open override /*2*/ val start: kotlin.Short - public open override /*2*/ fun (): kotlin.Short - public final override /*1*/ /*fake_override*/ val step: kotlin.Int - public final override /*1*/ /*fake_override*/ fun (): kotlin.Int - public open override /*1*/ fun contains(/*0*/ value: kotlin.Short): kotlin.Boolean - public open override /*2*/ fun isEmpty(): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.ShortIterator - - public companion object Companion { - /*primary*/ private constructor Companion() - public final val EMPTY: kotlin.ShortRange - public final fun (): kotlin.ShortRange - } -} - public final class String : kotlin.Comparable, kotlin.CharSequence { /*primary*/ public constructor String() public open override /*1*/ val length: kotlin.Int diff --git a/compiler/tests/org/jetbrains/kotlin/serialization/builtins/LoadBuiltinsTest.java b/compiler/tests/org/jetbrains/kotlin/serialization/builtins/LoadBuiltinsTest.java index c1fac245154..791481fba12 100644 --- a/compiler/tests/org/jetbrains/kotlin/serialization/builtins/LoadBuiltinsTest.java +++ b/compiler/tests/org/jetbrains/kotlin/serialization/builtins/LoadBuiltinsTest.java @@ -31,6 +31,7 @@ import org.jetbrains.kotlin.descriptors.ModuleParameters; import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor; import org.jetbrains.kotlin.descriptors.PackageFragmentProvider; import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl; +import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.psi.KtFile; import org.jetbrains.kotlin.renderer.DescriptorRenderer; @@ -53,8 +54,7 @@ import java.util.List; import java.util.regex.Pattern; import static org.jetbrains.kotlin.builtins.BuiltInsPackageFragmentProviderKt.createBuiltInPackageFragmentProvider; -import static org.jetbrains.kotlin.builtins.KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME; -import static org.jetbrains.kotlin.builtins.KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAMES; +import static org.jetbrains.kotlin.builtins.KotlinBuiltIns.*; public class LoadBuiltinsTest extends KotlinTestWithEnvironment { @Override @@ -80,28 +80,31 @@ public class LoadBuiltinsTest extends KotlinTestWithEnvironment { ) ); - PackageFragmentDescriptor deserialized = createBuiltInsPackageFragment(); + PackageFragmentProvider packageFragmentProvider = createBuiltInsPackageFragmentProvider(); List files = KotlinTestUtils.loadToJetFiles(getEnvironment(), ContainerUtil.concat( allFilesUnder("core/builtins/native"), allFilesUnder("core/builtins/src") )); - ModuleDescriptor module = LazyResolveTestUtil.resolveLazily(files, getEnvironment(), false); - List fragments = module.getPackage(BUILT_INS_PACKAGE_FQ_NAME).getFragments(); - for (PackageFragmentDescriptor fromLazyResolve : fragments) { + final ModuleDescriptor module = LazyResolveTestUtil.resolveLazily(files, getEnvironment(), false); + + for (FqName packageFqName : CollectionsKt.listOf(BUILT_INS_PACKAGE_FQ_NAME, COLLECTIONS_PACKAGE_FQ_NAME, RANGES_PACKAGE_FQ_NAME)) { + PackageFragmentDescriptor fromLazyResolve = + CollectionsKt.single(module.getPackage(packageFqName).getFragments()); if (fromLazyResolve instanceof LazyPackageDescriptor) { + PackageFragmentDescriptor deserialized = + CollectionsKt.single(packageFragmentProvider.getPackageFragments(packageFqName)); RecursiveDescriptorComparator.validateAndCompareDescriptors( fromLazyResolve, deserialized, configuration, - new File("compiler/testData/builtin-classes.txt") + new File("compiler/testData/builtin-classes-" + packageFqName.asString().replace('.', '-') + ".txt") ); - break; } } } @NotNull - private static PackageFragmentDescriptor createBuiltInsPackageFragment() { + private static PackageFragmentProvider createBuiltInsPackageFragmentProvider() { LockBasedStorageManager storageManager = new LockBasedStorageManager(); ModuleDescriptorImpl builtInsModule = new ModuleDescriptorImpl( Name.special(""), storageManager, ModuleParameters.Empty.INSTANCE, DefaultBuiltIns.getInstance() @@ -122,7 +125,7 @@ public class LoadBuiltinsTest extends KotlinTestWithEnvironment { builtInsModule.initialize(packageFragmentProvider); builtInsModule.setDependencies(builtInsModule); - return CollectionsKt.single(packageFragmentProvider.getPackageFragments(BUILT_INS_PACKAGE_FQ_NAME)); + return packageFragmentProvider; } @NotNull