From e593d8b9ed6d8d98c698d0a7dc47c3341d59c357 Mon Sep 17 00:00:00 2001
From: Simon Ochsenreither <simon@ochsenreither.de>
Date: Tue, 27 Mar 2012 20:08:30 +0200
Subject: Make NumericRange# O(1) instead of O(n).

It makes me a bit nervous that NumericRange[Int] will
get different wrong values in overflow situations compared
to Range due to the missing toLong though.

It could probably need some investigation if reordering the
operations can rule out wrong values, e. g. only fail when
the fold also fails.

Apart from that, it might make sense to just throw an exception
if an overflow happens instead of silent overflow.
---
 test/files/run/t4658.check | 12 ++++++------
 test/files/run/t4658.scala | 14 +++-----------
 2 files changed, 9 insertions(+), 17 deletions(-)

(limited to 'test')

diff --git a/test/files/run/t4658.check b/test/files/run/t4658.check
index 743b0faee3..bb6405175e 100644
--- a/test/files/run/t4658.check
+++ b/test/files/run/t4658.check
@@ -19,8 +19,8 @@ Ranges:
 -30
 -10
 IntRanges:
-Disabled #1
-Disabled #2
+-1073741824
+-1073741824
 0
 0
 55
@@ -39,8 +39,8 @@ Disabled #2
 -30
 -10
 LongRanges:
-Disabled #1
-Disabled #2
+2305843008139952128
+-2305843008139952128
 0
 0
 55
@@ -59,8 +59,8 @@ Disabled #2
 -30
 -10
 BigIntRanges:
-Disabled #1
-Disabled #2
+2305843008139952128
+-2305843008139952128
 0
 0
 55
diff --git a/test/files/run/t4658.scala b/test/files/run/t4658.scala
index e1799fae9b..8c07c50694 100644
--- a/test/files/run/t4658.scala
+++ b/test/files/run/t4658.scala
@@ -20,22 +20,14 @@ object Test {
   def numericBigIntRanges = rangeData.map(r => if (r.inclusive) NumericRange.inclusive(BigInt(r.start), BigInt(r.end), BigInt(r.step)) else NumericRange(BigInt(r.start), BigInt(r.end), BigInt(r.step)))
 
   def main(args: Array[String]) {
-    // We drop the first two tests for all ranges which don't have a decent sum implementation,
-    // because it is just too slow.
     println("Ranges:")
     ranges.foreach{range => println(range.sum)}
     println("IntRanges:")
-    println("Disabled #1")
-    println("Disabled #2")
-    numericIntRanges.drop(2).foreach{range => println(range.sum)}
+    numericIntRanges.foreach{range => println(range.sum)}
     println("LongRanges:")
-    println("Disabled #1")
-    println("Disabled #2")
-    numericLongRanges.drop(2).foreach{range => println(range.sum)}
+    numericLongRanges.foreach{range => println(range.sum)}
     println("BigIntRanges:")
-    println("Disabled #1")
-    println("Disabled #2")
-    numericBigIntRanges.drop(2).foreach{range => println(range.sum)}
+    numericBigIntRanges.foreach{range => println(range.sum)}
   }
 
 }
\ No newline at end of file
-- 
cgit v1.2.3