summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2011-10-31 18:26:57 +0000
committerPaul Phillips <paulp@improving.org>2011-10-31 18:26:57 +0000
commitc0407608be3bd40e99dd2d86df6efb2446b1c1cd (patch)
tree8903449009b99a3cf7389f33087511333f345414
parentbf0b9fcf84d346231db868e522dce17ded59888e (diff)
downloadscala-c0407608be3bd40e99dd2d86df6efb2446b1c1cd.tar.gz
scala-c0407608be3bd40e99dd2d86df6efb2446b1c1cd.tar.bz2
scala-c0407608be3bd40e99dd2d86df6efb2446b1c1cd.zip
Fix for NumericRange boundary condition.
Contributed by Thomas Switzer. Closes SI-4985, no review.
-rw-r--r--src/library/scala/collection/immutable/NumericRange.scala2
-rw-r--r--test/files/specialized/fft.check2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/library/scala/collection/immutable/NumericRange.scala b/src/library/scala/collection/immutable/NumericRange.scala
index 0e32118696..e70db13251 100644
--- a/src/library/scala/collection/immutable/NumericRange.scala
+++ b/src/library/scala/collection/immutable/NumericRange.scala
@@ -207,7 +207,7 @@ object NumericRange {
else {
val diff = num.minus(end, start)
val jumps = num.toLong(num.quot(diff, step))
- val remainder = num.toLong(num.rem(diff, step))
+ val remainder = num.rem(diff, step)
val longCount = jumps + (
if (!isInclusive && zero == remainder) 0 else 1
)
diff --git a/test/files/specialized/fft.check b/test/files/specialized/fft.check
index 845729084d..74cb9bb3b5 100644
--- a/test/files/specialized/fft.check
+++ b/test/files/specialized/fft.check
@@ -1,4 +1,4 @@
Processing 65536 items
Boxed doubles: 0
Boxed ints: 2
-Boxed longs: 1245366
+Boxed longs: 1179811