diff --git a/libraries/stdlib/api/js-v1/kotlin.ranges.kt b/libraries/stdlib/api/js-v1/kotlin.ranges.kt index 844c9553073..cf6aedc2660 100644 --- a/libraries/stdlib/api/js-v1/kotlin.ranges.kt +++ b/libraries/stdlib/api/js-v1/kotlin.ranges.kt @@ -571,31 +571,6 @@ public operator fun kotlin.Float.rangeTo(that: kotlin.Float): kotlin.ranges.Clos @kotlin.ExperimentalStdlibApi public operator fun > T.rangeUntil(that: T): kotlin.ranges.OpenEndRange -@kotlin.SinceKotlin(version = "1.7") -@kotlin.ExperimentalStdlibApi -@kotlin.internal.InlineOnly -public inline operator fun kotlin.Byte.rangeUntil(to: kotlin.Byte): kotlin.ranges.IntRange - -@kotlin.SinceKotlin(version = "1.7") -@kotlin.ExperimentalStdlibApi -@kotlin.internal.InlineOnly -public inline operator fun kotlin.Byte.rangeUntil(to: kotlin.Int): kotlin.ranges.IntRange - -@kotlin.SinceKotlin(version = "1.7") -@kotlin.ExperimentalStdlibApi -@kotlin.internal.InlineOnly -public inline operator fun kotlin.Byte.rangeUntil(to: kotlin.Long): kotlin.ranges.LongRange - -@kotlin.SinceKotlin(version = "1.7") -@kotlin.ExperimentalStdlibApi -@kotlin.internal.InlineOnly -public inline operator fun kotlin.Byte.rangeUntil(to: kotlin.Short): kotlin.ranges.IntRange - -@kotlin.SinceKotlin(version = "1.7") -@kotlin.ExperimentalStdlibApi -@kotlin.internal.InlineOnly -public inline operator fun kotlin.Char.rangeUntil(to: kotlin.Char): kotlin.ranges.CharRange - @kotlin.SinceKotlin(version = "1.7") @kotlin.ExperimentalStdlibApi public operator fun kotlin.Double.rangeUntil(that: kotlin.Double): kotlin.ranges.OpenEndRange @@ -604,86 +579,6 @@ public operator fun kotlin.Double.rangeUntil(that: kotlin.Double): kotlin.ranges @kotlin.ExperimentalStdlibApi public operator fun kotlin.Float.rangeUntil(that: kotlin.Float): kotlin.ranges.OpenEndRange -@kotlin.SinceKotlin(version = "1.7") -@kotlin.ExperimentalStdlibApi -@kotlin.internal.InlineOnly -public inline operator fun kotlin.Int.rangeUntil(to: kotlin.Byte): kotlin.ranges.IntRange - -@kotlin.SinceKotlin(version = "1.7") -@kotlin.ExperimentalStdlibApi -@kotlin.internal.InlineOnly -public inline operator fun kotlin.Int.rangeUntil(to: kotlin.Int): kotlin.ranges.IntRange - -@kotlin.SinceKotlin(version = "1.7") -@kotlin.ExperimentalStdlibApi -@kotlin.internal.InlineOnly -public inline operator fun kotlin.Int.rangeUntil(to: kotlin.Long): kotlin.ranges.LongRange - -@kotlin.SinceKotlin(version = "1.7") -@kotlin.ExperimentalStdlibApi -@kotlin.internal.InlineOnly -public inline operator fun kotlin.Int.rangeUntil(to: kotlin.Short): kotlin.ranges.IntRange - -@kotlin.SinceKotlin(version = "1.7") -@kotlin.ExperimentalStdlibApi -@kotlin.internal.InlineOnly -public inline operator fun kotlin.Long.rangeUntil(to: kotlin.Byte): kotlin.ranges.LongRange - -@kotlin.SinceKotlin(version = "1.7") -@kotlin.ExperimentalStdlibApi -@kotlin.internal.InlineOnly -public inline operator fun kotlin.Long.rangeUntil(to: kotlin.Int): kotlin.ranges.LongRange - -@kotlin.SinceKotlin(version = "1.7") -@kotlin.ExperimentalStdlibApi -@kotlin.internal.InlineOnly -public inline operator fun kotlin.Long.rangeUntil(to: kotlin.Long): kotlin.ranges.LongRange - -@kotlin.SinceKotlin(version = "1.7") -@kotlin.ExperimentalStdlibApi -@kotlin.internal.InlineOnly -public inline operator fun kotlin.Long.rangeUntil(to: kotlin.Short): kotlin.ranges.LongRange - -@kotlin.SinceKotlin(version = "1.7") -@kotlin.ExperimentalStdlibApi -@kotlin.internal.InlineOnly -public inline operator fun kotlin.Short.rangeUntil(to: kotlin.Byte): kotlin.ranges.IntRange - -@kotlin.SinceKotlin(version = "1.7") -@kotlin.ExperimentalStdlibApi -@kotlin.internal.InlineOnly -public inline operator fun kotlin.Short.rangeUntil(to: kotlin.Int): kotlin.ranges.IntRange - -@kotlin.SinceKotlin(version = "1.7") -@kotlin.ExperimentalStdlibApi -@kotlin.internal.InlineOnly -public inline operator fun kotlin.Short.rangeUntil(to: kotlin.Long): kotlin.ranges.LongRange - -@kotlin.SinceKotlin(version = "1.7") -@kotlin.ExperimentalStdlibApi -@kotlin.internal.InlineOnly -public inline operator fun kotlin.Short.rangeUntil(to: kotlin.Short): kotlin.ranges.IntRange - -@kotlin.SinceKotlin(version = "1.7") -@kotlin.ExperimentalStdlibApi -@kotlin.internal.InlineOnly -public inline operator fun kotlin.UByte.rangeUntil(to: kotlin.UByte): kotlin.ranges.UIntRange - -@kotlin.SinceKotlin(version = "1.7") -@kotlin.ExperimentalStdlibApi -@kotlin.internal.InlineOnly -public inline operator fun kotlin.UInt.rangeUntil(to: kotlin.UInt): kotlin.ranges.UIntRange - -@kotlin.SinceKotlin(version = "1.7") -@kotlin.ExperimentalStdlibApi -@kotlin.internal.InlineOnly -public inline operator fun kotlin.ULong.rangeUntil(to: kotlin.ULong): kotlin.ranges.ULongRange - -@kotlin.SinceKotlin(version = "1.7") -@kotlin.ExperimentalStdlibApi -@kotlin.internal.InlineOnly -public inline operator fun kotlin.UShort.rangeUntil(to: kotlin.UShort): kotlin.ranges.UIntRange - public fun kotlin.ranges.CharProgression.reversed(): kotlin.ranges.CharProgression public fun kotlin.ranges.IntProgression.reversed(): kotlin.ranges.IntProgression diff --git a/libraries/stdlib/api/js/kotlin.ranges.kt b/libraries/stdlib/api/js/kotlin.ranges.kt index f034aefcbe2..f01c5c33405 100644 --- a/libraries/stdlib/api/js/kotlin.ranges.kt +++ b/libraries/stdlib/api/js/kotlin.ranges.kt @@ -571,31 +571,6 @@ public operator fun kotlin.Float.rangeTo(that: kotlin.Float): kotlin.ranges.Clos @kotlin.ExperimentalStdlibApi public operator fun > T.rangeUntil(that: T): kotlin.ranges.OpenEndRange -@kotlin.SinceKotlin(version = "1.7") -@kotlin.ExperimentalStdlibApi -@kotlin.internal.InlineOnly -public inline operator fun kotlin.Byte.rangeUntil(to: kotlin.Byte): kotlin.ranges.IntRange - -@kotlin.SinceKotlin(version = "1.7") -@kotlin.ExperimentalStdlibApi -@kotlin.internal.InlineOnly -public inline operator fun kotlin.Byte.rangeUntil(to: kotlin.Int): kotlin.ranges.IntRange - -@kotlin.SinceKotlin(version = "1.7") -@kotlin.ExperimentalStdlibApi -@kotlin.internal.InlineOnly -public inline operator fun kotlin.Byte.rangeUntil(to: kotlin.Long): kotlin.ranges.LongRange - -@kotlin.SinceKotlin(version = "1.7") -@kotlin.ExperimentalStdlibApi -@kotlin.internal.InlineOnly -public inline operator fun kotlin.Byte.rangeUntil(to: kotlin.Short): kotlin.ranges.IntRange - -@kotlin.SinceKotlin(version = "1.7") -@kotlin.ExperimentalStdlibApi -@kotlin.internal.InlineOnly -public inline operator fun kotlin.Char.rangeUntil(to: kotlin.Char): kotlin.ranges.CharRange - @kotlin.SinceKotlin(version = "1.7") @kotlin.ExperimentalStdlibApi public operator fun kotlin.Double.rangeUntil(that: kotlin.Double): kotlin.ranges.OpenEndRange @@ -604,86 +579,6 @@ public operator fun kotlin.Double.rangeUntil(that: kotlin.Double): kotlin.ranges @kotlin.ExperimentalStdlibApi public operator fun kotlin.Float.rangeUntil(that: kotlin.Float): kotlin.ranges.OpenEndRange -@kotlin.SinceKotlin(version = "1.7") -@kotlin.ExperimentalStdlibApi -@kotlin.internal.InlineOnly -public inline operator fun kotlin.Int.rangeUntil(to: kotlin.Byte): kotlin.ranges.IntRange - -@kotlin.SinceKotlin(version = "1.7") -@kotlin.ExperimentalStdlibApi -@kotlin.internal.InlineOnly -public inline operator fun kotlin.Int.rangeUntil(to: kotlin.Int): kotlin.ranges.IntRange - -@kotlin.SinceKotlin(version = "1.7") -@kotlin.ExperimentalStdlibApi -@kotlin.internal.InlineOnly -public inline operator fun kotlin.Int.rangeUntil(to: kotlin.Long): kotlin.ranges.LongRange - -@kotlin.SinceKotlin(version = "1.7") -@kotlin.ExperimentalStdlibApi -@kotlin.internal.InlineOnly -public inline operator fun kotlin.Int.rangeUntil(to: kotlin.Short): kotlin.ranges.IntRange - -@kotlin.SinceKotlin(version = "1.7") -@kotlin.ExperimentalStdlibApi -@kotlin.internal.InlineOnly -public inline operator fun kotlin.Long.rangeUntil(to: kotlin.Byte): kotlin.ranges.LongRange - -@kotlin.SinceKotlin(version = "1.7") -@kotlin.ExperimentalStdlibApi -@kotlin.internal.InlineOnly -public inline operator fun kotlin.Long.rangeUntil(to: kotlin.Int): kotlin.ranges.LongRange - -@kotlin.SinceKotlin(version = "1.7") -@kotlin.ExperimentalStdlibApi -@kotlin.internal.InlineOnly -public inline operator fun kotlin.Long.rangeUntil(to: kotlin.Long): kotlin.ranges.LongRange - -@kotlin.SinceKotlin(version = "1.7") -@kotlin.ExperimentalStdlibApi -@kotlin.internal.InlineOnly -public inline operator fun kotlin.Long.rangeUntil(to: kotlin.Short): kotlin.ranges.LongRange - -@kotlin.SinceKotlin(version = "1.7") -@kotlin.ExperimentalStdlibApi -@kotlin.internal.InlineOnly -public inline operator fun kotlin.Short.rangeUntil(to: kotlin.Byte): kotlin.ranges.IntRange - -@kotlin.SinceKotlin(version = "1.7") -@kotlin.ExperimentalStdlibApi -@kotlin.internal.InlineOnly -public inline operator fun kotlin.Short.rangeUntil(to: kotlin.Int): kotlin.ranges.IntRange - -@kotlin.SinceKotlin(version = "1.7") -@kotlin.ExperimentalStdlibApi -@kotlin.internal.InlineOnly -public inline operator fun kotlin.Short.rangeUntil(to: kotlin.Long): kotlin.ranges.LongRange - -@kotlin.SinceKotlin(version = "1.7") -@kotlin.ExperimentalStdlibApi -@kotlin.internal.InlineOnly -public inline operator fun kotlin.Short.rangeUntil(to: kotlin.Short): kotlin.ranges.IntRange - -@kotlin.SinceKotlin(version = "1.7") -@kotlin.ExperimentalStdlibApi -@kotlin.internal.InlineOnly -public inline operator fun kotlin.UByte.rangeUntil(to: kotlin.UByte): kotlin.ranges.UIntRange - -@kotlin.SinceKotlin(version = "1.7") -@kotlin.ExperimentalStdlibApi -@kotlin.internal.InlineOnly -public inline operator fun kotlin.UInt.rangeUntil(to: kotlin.UInt): kotlin.ranges.UIntRange - -@kotlin.SinceKotlin(version = "1.7") -@kotlin.ExperimentalStdlibApi -@kotlin.internal.InlineOnly -public inline operator fun kotlin.ULong.rangeUntil(to: kotlin.ULong): kotlin.ranges.ULongRange - -@kotlin.SinceKotlin(version = "1.7") -@kotlin.ExperimentalStdlibApi -@kotlin.internal.InlineOnly -public inline operator fun kotlin.UShort.rangeUntil(to: kotlin.UShort): kotlin.ranges.UIntRange - public fun kotlin.ranges.CharProgression.reversed(): kotlin.ranges.CharProgression public fun kotlin.ranges.IntProgression.reversed(): kotlin.ranges.IntProgression diff --git a/libraries/stdlib/common/src/generated/_Ranges.kt b/libraries/stdlib/common/src/generated/_Ranges.kt index e04479b539c..9165568e968 100644 --- a/libraries/stdlib/common/src/generated/_Ranges.kt +++ b/libraries/stdlib/common/src/generated/_Ranges.kt @@ -938,227 +938,6 @@ public infix fun Short.downTo(to: Short): IntProgression { return IntProgression.fromClosedRange(this.toInt(), to.toInt(), -1) } -/** - * Returns a range from this value up to but excluding the specified [to] value. - * - * If the [to] value is less than or equal to `this` value, then the returned range is empty. - */ -@SinceKotlin("1.7") -@ExperimentalStdlibApi -@kotlin.internal.InlineOnly -@Suppress("EXTENSION_SHADOWED_BY_MEMBER") -public inline operator fun Int.rangeUntil(to: Byte): IntRange { - return until(to) -} - -/** - * Returns a range from this value up to but excluding the specified [to] value. - * - * If the [to] value is less than or equal to `this` value, then the returned range is empty. - */ -@SinceKotlin("1.7") -@ExperimentalStdlibApi -@kotlin.internal.InlineOnly -@Suppress("EXTENSION_SHADOWED_BY_MEMBER") -public inline operator fun Long.rangeUntil(to: Byte): LongRange { - return until(to) -} - -/** - * Returns a range from this value up to but excluding the specified [to] value. - * - * If the [to] value is less than or equal to `this` value, then the returned range is empty. - */ -@SinceKotlin("1.7") -@ExperimentalStdlibApi -@kotlin.internal.InlineOnly -@Suppress("EXTENSION_SHADOWED_BY_MEMBER") -public inline operator fun Byte.rangeUntil(to: Byte): IntRange { - return until(to) -} - -/** - * Returns a range from this value up to but excluding the specified [to] value. - * - * If the [to] value is less than or equal to `this` value, then the returned range is empty. - */ -@SinceKotlin("1.7") -@ExperimentalStdlibApi -@kotlin.internal.InlineOnly -@Suppress("EXTENSION_SHADOWED_BY_MEMBER") -public inline operator fun Short.rangeUntil(to: Byte): IntRange { - return until(to) -} - -/** - * Returns a range from this value up to but excluding the specified [to] value. - * - * If the [to] value is less than or equal to `this` value, then the returned range is empty. - */ -@SinceKotlin("1.7") -@ExperimentalStdlibApi -@kotlin.internal.InlineOnly -@Suppress("EXTENSION_SHADOWED_BY_MEMBER") -public inline operator fun Char.rangeUntil(to: Char): CharRange { - return until(to) -} - -/** - * Returns a range from this value up to but excluding the specified [to] value. - * - * If the [to] value is less than or equal to `this` value, then the returned range is empty. - */ -@SinceKotlin("1.7") -@ExperimentalStdlibApi -@kotlin.internal.InlineOnly -@Suppress("EXTENSION_SHADOWED_BY_MEMBER") -public inline operator fun Int.rangeUntil(to: Int): IntRange { - return until(to) -} - -/** - * Returns a range from this value up to but excluding the specified [to] value. - * - * If the [to] value is less than or equal to `this` value, then the returned range is empty. - */ -@SinceKotlin("1.7") -@ExperimentalStdlibApi -@kotlin.internal.InlineOnly -@Suppress("EXTENSION_SHADOWED_BY_MEMBER") -public inline operator fun Long.rangeUntil(to: Int): LongRange { - return until(to) -} - -/** - * Returns a range from this value up to but excluding the specified [to] value. - * - * If the [to] value is less than or equal to `this` value, then the returned range is empty. - */ -@SinceKotlin("1.7") -@ExperimentalStdlibApi -@kotlin.internal.InlineOnly -@Suppress("EXTENSION_SHADOWED_BY_MEMBER") -public inline operator fun Byte.rangeUntil(to: Int): IntRange { - return until(to) -} - -/** - * Returns a range from this value up to but excluding the specified [to] value. - * - * If the [to] value is less than or equal to `this` value, then the returned range is empty. - */ -@SinceKotlin("1.7") -@ExperimentalStdlibApi -@kotlin.internal.InlineOnly -@Suppress("EXTENSION_SHADOWED_BY_MEMBER") -public inline operator fun Short.rangeUntil(to: Int): IntRange { - return until(to) -} - -/** - * Returns a range from this value up to but excluding the specified [to] value. - * - * If the [to] value is less than or equal to `this` value, then the returned range is empty. - */ -@SinceKotlin("1.7") -@ExperimentalStdlibApi -@kotlin.internal.InlineOnly -@Suppress("EXTENSION_SHADOWED_BY_MEMBER") -public inline operator fun Int.rangeUntil(to: Long): LongRange { - return until(to) -} - -/** - * Returns a range from this value up to but excluding the specified [to] value. - * - * If the [to] value is less than or equal to `this` value, then the returned range is empty. - */ -@SinceKotlin("1.7") -@ExperimentalStdlibApi -@kotlin.internal.InlineOnly -@Suppress("EXTENSION_SHADOWED_BY_MEMBER") -public inline operator fun Long.rangeUntil(to: Long): LongRange { - return until(to) -} - -/** - * Returns a range from this value up to but excluding the specified [to] value. - * - * If the [to] value is less than or equal to `this` value, then the returned range is empty. - */ -@SinceKotlin("1.7") -@ExperimentalStdlibApi -@kotlin.internal.InlineOnly -@Suppress("EXTENSION_SHADOWED_BY_MEMBER") -public inline operator fun Byte.rangeUntil(to: Long): LongRange { - return until(to) -} - -/** - * Returns a range from this value up to but excluding the specified [to] value. - * - * If the [to] value is less than or equal to `this` value, then the returned range is empty. - */ -@SinceKotlin("1.7") -@ExperimentalStdlibApi -@kotlin.internal.InlineOnly -@Suppress("EXTENSION_SHADOWED_BY_MEMBER") -public inline operator fun Short.rangeUntil(to: Long): LongRange { - return until(to) -} - -/** - * Returns a range from this value up to but excluding the specified [to] value. - * - * If the [to] value is less than or equal to `this` value, then the returned range is empty. - */ -@SinceKotlin("1.7") -@ExperimentalStdlibApi -@kotlin.internal.InlineOnly -@Suppress("EXTENSION_SHADOWED_BY_MEMBER") -public inline operator fun Int.rangeUntil(to: Short): IntRange { - return until(to) -} - -/** - * Returns a range from this value up to but excluding the specified [to] value. - * - * If the [to] value is less than or equal to `this` value, then the returned range is empty. - */ -@SinceKotlin("1.7") -@ExperimentalStdlibApi -@kotlin.internal.InlineOnly -@Suppress("EXTENSION_SHADOWED_BY_MEMBER") -public inline operator fun Long.rangeUntil(to: Short): LongRange { - return until(to) -} - -/** - * Returns a range from this value up to but excluding the specified [to] value. - * - * If the [to] value is less than or equal to `this` value, then the returned range is empty. - */ -@SinceKotlin("1.7") -@ExperimentalStdlibApi -@kotlin.internal.InlineOnly -@Suppress("EXTENSION_SHADOWED_BY_MEMBER") -public inline operator fun Byte.rangeUntil(to: Short): IntRange { - return until(to) -} - -/** - * Returns a range from this value up to but excluding the specified [to] value. - * - * If the [to] value is less than or equal to `this` value, then the returned range is empty. - */ -@SinceKotlin("1.7") -@ExperimentalStdlibApi -@kotlin.internal.InlineOnly -@Suppress("EXTENSION_SHADOWED_BY_MEMBER") -public inline operator fun Short.rangeUntil(to: Short): IntRange { - return until(to) -} - /** * Returns a progression that goes over the same range in the opposite direction with the same step. */ diff --git a/libraries/stdlib/common/src/generated/_URanges.kt b/libraries/stdlib/common/src/generated/_URanges.kt index e413ce07116..b432e514a5d 100644 --- a/libraries/stdlib/common/src/generated/_URanges.kt +++ b/libraries/stdlib/common/src/generated/_URanges.kt @@ -325,58 +325,6 @@ public infix fun UShort.downTo(to: UShort): UIntProgression { return UIntProgression.fromClosedRange(this.toUInt(), to.toUInt(), -1) } -/** - * Returns a range from this value up to but excluding the specified [to] value. - * - * If the [to] value is less than or equal to `this` value, then the returned range is empty. - */ -@SinceKotlin("1.7") -@ExperimentalStdlibApi -@kotlin.internal.InlineOnly -@Suppress("EXTENSION_SHADOWED_BY_MEMBER") -public inline operator fun UByte.rangeUntil(to: UByte): UIntRange { - return until(to) -} - -/** - * Returns a range from this value up to but excluding the specified [to] value. - * - * If the [to] value is less than or equal to `this` value, then the returned range is empty. - */ -@SinceKotlin("1.7") -@ExperimentalStdlibApi -@kotlin.internal.InlineOnly -@Suppress("EXTENSION_SHADOWED_BY_MEMBER") -public inline operator fun UInt.rangeUntil(to: UInt): UIntRange { - return until(to) -} - -/** - * Returns a range from this value up to but excluding the specified [to] value. - * - * If the [to] value is less than or equal to `this` value, then the returned range is empty. - */ -@SinceKotlin("1.7") -@ExperimentalStdlibApi -@kotlin.internal.InlineOnly -@Suppress("EXTENSION_SHADOWED_BY_MEMBER") -public inline operator fun ULong.rangeUntil(to: ULong): ULongRange { - return until(to) -} - -/** - * Returns a range from this value up to but excluding the specified [to] value. - * - * If the [to] value is less than or equal to `this` value, then the returned range is empty. - */ -@SinceKotlin("1.7") -@ExperimentalStdlibApi -@kotlin.internal.InlineOnly -@Suppress("EXTENSION_SHADOWED_BY_MEMBER") -public inline operator fun UShort.rangeUntil(to: UShort): UIntRange { - return until(to) -} - /** * Returns a progression that goes over the same range in the opposite direction with the same step. */ diff --git a/libraries/tools/kotlin-stdlib-gen/src/templates/Ranges.kt b/libraries/tools/kotlin-stdlib-gen/src/templates/Ranges.kt index 56887190784..fb5c6c3cb2d 100644 --- a/libraries/tools/kotlin-stdlib-gen/src/templates/Ranges.kt +++ b/libraries/tools/kotlin-stdlib-gen/src/templates/Ranges.kt @@ -152,31 +152,6 @@ object RangeOps : TemplateGroupBase() { } } - val f_rangeUntil = fn("rangeUntil(to: Primitive)").byTwoPrimitives { - include(Primitives, integralCombinations + unsignedMappings) - } builderWith { (fromType, toType) -> - operator() - inlineOnly() - since("1.7") - annotation("@ExperimentalStdlibApi") - suppress("EXTENSION_SHADOWED_BY_MEMBER") - signature("rangeUntil(to: $toType)") - - val elementType = rangeElementType(fromType, toType) - val progressionType = elementType.name + "Range" - returns(progressionType) - - doc { - """ - Returns a range from this value up to but excluding the specified [to] value. - - If the [to] value is less than or equal to `this` value, then the returned range is empty. - """ - } - - body { "return until(to)" } - } - val f_containsMixedClosed = fn("contains(value: Primitive)").byTwoPrimitives { include(Ranges, numericCombinations) filter { _, (rangeType, itemType) -> rangeType != itemType }