From d48ec7e2964e893752b122dadc86e30640afcd2c Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Thu, 14 Jan 2016 21:08:15 +0300 Subject: [PATCH] Update testData for LoadBuiltinsTest --- .../builtin-classes-kotlin-ranges.txt | 209 ++---------------- compiler/testData/builtin-classes-kotlin.txt | 10 - 2 files changed, 17 insertions(+), 202 deletions(-) diff --git a/compiler/testData/builtin-classes-kotlin-ranges.txt b/compiler/testData/builtin-classes-kotlin-ranges.txt index b6b87bfae9a..abf3adfd586 100644 --- a/compiler/testData/builtin-classes-kotlin-ranges.txt +++ b/compiler/testData/builtin-classes-kotlin-ranges.txt @@ -1,84 +1,11 @@ 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 open class CharProgression : kotlin.collections.Iterable { + /*primary*/ internal constructor CharProgression(/*0*/ start: kotlin.Char, /*1*/ endInclusive: kotlin.Char, /*2*/ step: kotlin.Int) 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 @@ -109,18 +36,14 @@ internal final class CharProgressionIterator : kotlin.collections.CharIterator { 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 open override /*1*/ val start: kotlin.Char + public open override /*1*/ 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 @@ -134,29 +57,21 @@ public final class CharRange : kotlin.ranges.CharProgression, kotlin.ranges.Clos } } -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 interface ClosedRange> { 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 abstract val start: T + public abstract fun (): T + public open operator fun contains(/*0*/ value: T): kotlin.Boolean + public open 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 open class IntProgression : kotlin.collections.Iterable { + /*primary*/ internal constructor IntProgression(/*0*/ start: kotlin.Int, /*1*/ endInclusive: kotlin.Int, /*2*/ step: 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 @@ -187,18 +102,14 @@ internal final class IntProgressionIterator : kotlin.collections.IntIterator { 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 open override /*1*/ val start: kotlin.Int + public open override /*1*/ 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 @@ -212,18 +123,12 @@ public final class IntRange : kotlin.ranges.IntProgression, kotlin.ranges.Closed } } -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 open class LongProgression : kotlin.collections.Iterable { + /*primary*/ internal constructor LongProgression(/*0*/ start: kotlin.Long, /*1*/ endInclusive: kotlin.Long, /*2*/ step: 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 @@ -254,18 +159,14 @@ internal final class LongProgressionIterator : kotlin.collections.LongIterator { 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 open override /*1*/ val start: kotlin.Long + public open override /*1*/ 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 @@ -278,79 +179,3 @@ public final class LongRange : kotlin.ranges.LongProgression, kotlin.ranges.Clos 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-kotlin.txt b/compiler/testData/builtin-classes-kotlin.txt index c13574b3efb..3559968abb3 100644 --- a/compiler/testData/builtin-classes-kotlin.txt +++ b/compiler/testData/builtin-classes-kotlin.txt @@ -578,16 +578,6 @@ 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.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.collections.Iterator -} - @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Please use KProperty instead.", replaceWith = kotlin.ReplaceWith(expression = "KProperty<*>", imports = {"kotlin.reflect.KProperty"})) internal interface PropertyMetadata { public abstract val name: kotlin.String public abstract fun (): kotlin.String