Add specialization overloads for Float.rangeTo and Double.rangeTo to resolve them statically.

js/js.libraries/src/core/ranges.kt

@@ -0,0 +1,21 @@
+/*
+ * Copyright 2010-2016 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package kotlin.ranges
+
+@SinceKotlin("1.1")
+public inline operator fun Float.rangeTo(that: Float): ClosedRange<Float> =
+        this.toDouble().rangeTo(that.toDouble()) as ClosedRange<Float>

libraries/stdlib/src/kotlin/ranges/Ranges.kt

@@ -25,30 +25,69 @@ private open class ComparableRange<T: Comparable<T>> (
 private class DoubleRange (
         start: Double,
         endInclusive: Double
-): ComparableRange<Double>(start, endInclusive) {
-    override fun contains(value: Double): Boolean = value >= start && value <= endInclusive
-    override fun isEmpty(): Boolean = start > endInclusive
+): ClosedRange<Double> {
+    private val _start = start
+    private val _endInclusive = endInclusive
+    override val start: Double get() = _start
+    override val endInclusive: Double get() = _endInclusive
+
+    override fun contains(value: Double): Boolean = value >= _start && value <= _endInclusive
+    override fun isEmpty(): Boolean = !(_start <= _endInclusive)
+
+    override fun equals(other: Any?): Boolean {
+        return other is DoubleRange && (isEmpty() && other.isEmpty() ||
+                _start == other._start && _endInclusive == other._endInclusive)
+    }
+
+    override fun hashCode(): Int {
+        return if (isEmpty()) -1 else 31 * _start.hashCode() + _endInclusive.hashCode()
+    }
+    override fun toString(): String = "$_start..$_endInclusive"
 }
 
+@JvmVersion
 private class FloatRange (
         start: Float,
         endInclusive: Float
-): ComparableRange<Float>(start, endInclusive) {
-    override fun contains(value: Float): Boolean = value >= start && value <= endInclusive
-    override fun isEmpty(): Boolean = start > endInclusive
+): ClosedRange<Float> {
+    private val _start = start
+    private val _endInclusive = endInclusive
+    override val start: Float get() = _start
+    override val endInclusive: Float get() = _endInclusive
+
+    override fun contains(value: Float): Boolean = value >= _start && value <= _endInclusive
+    override fun isEmpty(): Boolean = !(_start <= _endInclusive)
+
+    override fun equals(other: Any?): Boolean {
+        return other is FloatRange && (isEmpty() && other.isEmpty() ||
+                _start == other._start && _endInclusive == other._endInclusive)
+    }
+
+    override fun hashCode(): Int {
+        return if (isEmpty()) -1 else 31 * _start.hashCode() + _endInclusive.hashCode()
+    }
+    override fun toString(): String = "$_start..$_endInclusive"
 }
 
 /**
- * Creates a range from this [Comparable] value to the specified [that] value. This value
- * needs to be smaller than [that] value, otherwise the returned range will be empty.
+ * Creates a range from this [Comparable] value to the specified [that] value.
+ *
+ * This value needs to be smaller than [that] value, otherwise the returned range will be empty.
  */
-public operator fun <T: Comparable<T>> T.rangeTo(that: T): ClosedRange<T> =
-        @Suppress("UNCHECKED_CAST")
-        when {
-            this is Double && that is Double -> DoubleRange(this, that) as ClosedRange<T>
-            this is Float && that is Float -> FloatRange(this, that) as ClosedRange<T>
-            else -> ComparableRange(this, that)
-        }
+public operator fun <T: Comparable<T>> T.rangeTo(that: T): ClosedRange<T> = ComparableRange(this, that)
+
+/**
+ * Creates a range from this [Double] value to the specified [other] value.
+ */
+@SinceKotlin("1.1")
+public operator fun Double.rangeTo(that: Double): ClosedRange<Double> = DoubleRange(this, that)
+
+/**
+ * Creates a range from this [Float] value to the specified [other] value.
+ */
+@JvmVersion
+@SinceKotlin("1.1")
+public operator fun Float.rangeTo(that: Float): ClosedRange<Float> = FloatRange(this, that)
 
 
 internal fun checkStepIsPositive(isPositive: Boolean, step: Number) {

libraries/stdlib/test/ranges/RangeTest.kt

@@ -200,10 +200,12 @@ public class RangeTest {
         val specialRange = 0.0..-0.0
         assertFalse(specialRange.isEmpty())
         assertTrue(-0.0 in specialRange)
-        // should it be or not: assertEquals(-0.0..0.0, specialRange)
+        val normalSpecialRange = -0.0..0.0
+        assertEquals(specialRange, normalSpecialRange)
+        assertEquals(specialRange.hashCode(), normalSpecialRange.hashCode())
         val nanRange = 0.0..Double.NaN
         assertFalse(Double.NaN in nanRange)
-
+        assertTrue(nanRange.isEmpty())
     }
 
     @Test fun floatRange() {
@@ -236,9 +238,12 @@ public class RangeTest {
         val specialRange = 0.0F..-0.0F
         assertFalse(specialRange.isEmpty())
         assertTrue(-0.0F in specialRange)
-        // should it be or not: assertEquals(-0.0F..0.0F, specialRange)
+        val normalSpecialRange = -0.0F..0.0F
+        assertEquals(specialRange, normalSpecialRange)
+        assertEquals(specialRange.hashCode(), normalSpecialRange.hashCode())
         val nanRange = 0.0F..Float.NaN
         assertFalse(Float.NaN in nanRange)
+        assertTrue(nanRange.isEmpty())
     }
 
     @Test fun isEmpty() {

libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-stdlib.txt

@@ -1932,6 +1932,8 @@ public final class kotlin/ranges/RangesKt {
 	public static final fun longRangeContains (Lkotlin/ranges/ClosedRange;F)Z
 	public static final fun longRangeContains (Lkotlin/ranges/ClosedRange;I)Z
 	public static final fun longRangeContains (Lkotlin/ranges/ClosedRange;S)Z
+	public static final fun rangeTo (DD)Lkotlin/ranges/ClosedRange;
+	public static final fun rangeTo (FF)Lkotlin/ranges/ClosedRange;
 	public static final fun rangeTo (Ljava/lang/Comparable;Ljava/lang/Comparable;)Lkotlin/ranges/ClosedRange;
 	public static final fun reversed (Lkotlin/ranges/CharProgression;)Lkotlin/ranges/CharProgression;
 	public static final fun reversed (Lkotlin/ranges/IntProgression;)Lkotlin/ranges/IntProgression;