Merge pull request #5175 from som-snytt/issue/9656-range-toString

SI-9656 Distinguish Numeric with step type

4 files changed, 65 insertions, 8 deletions

diff --git a/test/files/jvm/serialization-new.check b/test/files/jvm/serialization-new.check
index 1c5dd4828b..ca91ec1073 100644
--- a/test/files/jvm/serialization-new.check
+++ b/test/files/jvm/serialization-new.check
@@ -97,12 +97,12 @@ x = Queue(a, b, c)
 y = Queue(a, b, c)
 x equals y: true, y equals x: true
 
-x = Range(0, 1, 2, 3, 4, 5, 6, 7, 8, 9)
-y = Range(0, 1, 2, 3, 4, 5, 6, 7, 8, 9)
+x = Range 0 until 10
+y = Range 0 until 10
 x equals y: true, y equals x: true
 
-x = NumericRange(0, 1, 2, 3, 4, 5, 6, 7, 8, 9)
-y = NumericRange(0, 1, 2, 3, 4, 5, 6, 7, 8, 9)
+x = NumericRange 0 until 10
+y = NumericRange 0 until 10
 x equals y: true, y equals x: true
 
 x = Map(1 -> A, 2 -> B, 3 -> C)
diff --git a/test/files/jvm/serialization.check b/test/files/jvm/serialization.check
index 1c5dd4828b..ca91ec1073 100644
--- a/test/files/jvm/serialization.check
+++ b/test/files/jvm/serialization.check
@@ -97,12 +97,12 @@ x = Queue(a, b, c)
 y = Queue(a, b, c)
 x equals y: true, y equals x: true
 
-x = Range(0, 1, 2, 3, 4, 5, 6, 7, 8, 9)
-y = Range(0, 1, 2, 3, 4, 5, 6, 7, 8, 9)
+x = Range 0 until 10
+y = Range 0 until 10
 x equals y: true, y equals x: true
 
-x = NumericRange(0, 1, 2, 3, 4, 5, 6, 7, 8, 9)
-y = NumericRange(0, 1, 2, 3, 4, 5, 6, 7, 8, 9)
+x = NumericRange 0 until 10
+y = NumericRange 0 until 10
 x equals y: true, y equals x: true
 
 x = Map(1 -> A, 2 -> B, 3 -> C)
diff --git a/test/files/run/t9656.check b/test/files/run/t9656.check
new file mode 100644
index 0000000000..03e3ff3b5f
--- /dev/null
+++ b/test/files/run/t9656.check
@@ -0,0 +1,14 @@
+Range 1 to 10
+Range 1 to 10
+inexact Range 1 to 10 by 2
+Range 1 to 10 by 3
+inexact Range 1 until 10 by 2
+Range 100 to 100
+empty Range 100 until 100
+NumericRange 1 to 10
+NumericRange 1 to 10 by 2
+NumericRange 0.1 until 1.0 by 0.1
+NumericRange 0.1 until 1.0 by 0.1
+NumericRange 0.1 until 1.0 by 0.1 (using NumericRange 0.1 until 1.0 by 0.1 of BigDecimal)
+NumericRange 0 days until 10 seconds by 1 second
+empty NumericRange 0 days until 0 days by 1 second
diff --git a/test/files/run/t9656.scala b/test/files/run/t9656.scala
new file mode 100644
index 0000000000..3732719553
--- /dev/null
+++ b/test/files/run/t9656.scala
@@ -0,0 +1,43 @@
+
+import scala.math.BigDecimal
+
+object Test extends App {
+  println(1 to 10)
+  println(1 to 10 by 1)
+  println(1 to 10 by 2)
+  println(1 to 10 by 3)
+  println(1 until 10 by 2)
+  println(100 to 100)
+  println(100 until 100)
+
+  println(1L to 10L)
+  println(1L to 10L by 2)
+
+  // want to know if this is BigDecimal or Double stepping by BigDecimal
+  println(0.1 until 1.0 by 0.1)
+  println(Range.BigDecimal(BigDecimal("0.1"), BigDecimal("1.0"), BigDecimal("0.1")))
+  println(Range.Double(0.1, 1.0, 0.1))
+
+  import concurrent.duration.{SECONDS => Seconds, _}, collection.immutable.NumericRange
+  implicit val `duration is integerish`: math.Integral[FiniteDuration] = new math.Integral[FiniteDuration] {
+    def quot(x: scala.concurrent.duration.FiniteDuration,y: scala.concurrent.duration.FiniteDuration): scala.concurrent.duration.FiniteDuration = ???
+    def rem(x: scala.concurrent.duration.FiniteDuration,y: scala.concurrent.duration.FiniteDuration): scala.concurrent.duration.FiniteDuration = ???
+
+    // Members declared in scala.math.Numeric
+    def fromInt(x: Int): scala.concurrent.duration.FiniteDuration = Duration(x, Seconds)
+    def minus(x: scala.concurrent.duration.FiniteDuration,y: scala.concurrent.duration.FiniteDuration): scala.concurrent.duration.FiniteDuration = ???
+    def negate(x: scala.concurrent.duration.FiniteDuration): scala.concurrent.duration.FiniteDuration = ???
+    def plus(x: scala.concurrent.duration.FiniteDuration,y: scala.concurrent.duration.FiniteDuration): scala.concurrent.duration.FiniteDuration = ???
+    def times(x: scala.concurrent.duration.FiniteDuration,y: scala.concurrent.duration.FiniteDuration): scala.concurrent.duration.FiniteDuration = ???
+    def toDouble(x: scala.concurrent.duration.FiniteDuration): Double = ???
+    def toFloat(x: scala.concurrent.duration.FiniteDuration): Float = ???
+    def toInt(x: scala.concurrent.duration.FiniteDuration): Int = toLong(x).toInt
+    def toLong(x: scala.concurrent.duration.FiniteDuration): Long = x.length
+
+    // Members declared in scala.math.Ordering
+    def compare(x: scala.concurrent.duration.FiniteDuration,y: scala.concurrent.duration.FiniteDuration): Int =
+      x.compare(y)
+  }
+  println(NumericRange(Duration.Zero, Duration(10, Seconds), Duration(1, Seconds)))
+  println(NumericRange(Duration.Zero, Duration.Zero, Duration(1, Seconds)))
+}