Fixing RangeError with code from 1.7 branch

r6p · Rus Pandey · commit 34f5c8f3fa53 · 2015-08-04T23:55:11.000+02:00
With my previous commit, RangeError: bignum too big to convert into `long' was the result when running (0...2**64).max This commit ports handling for non-RubyFixnums from the 1.7.20 branch. Addresses, #3118
diff --git a/core/src/main/java/org/jruby/RubyRange.java b/core/src/main/java/org/jruby/RubyRange.java
@@ -659,7 +659,11 @@ public IRubyObject max(ThreadContext context, Block block) {
             if (!(begin instanceof RubyInteger)) {
                 throw context.runtime.newTypeError("cannot exclude end value with non Integer begin value");
             }
-            rangeEnd = RubyFixnum.newFixnum(context.runtime, ((RubyInteger) end).getLongValue() - 1);
+            if (end instanceof RubyFixnum) {
+                rangeEnd = RubyFixnum.newFixnum(context.runtime, ((RubyFixnum)end).getLongValue() - 1);
+            } else {
+                rangeEnd =  end.callMethod(context, "-", RubyFixnum.one(context.runtime));
+            }
         } else {
             rangeEnd = end;
         }
diff --git a/test/mri/ruby/test_range.rb b/test/mri/ruby/test_range.rb
@@ -69,6 +69,7 @@ def test_max
     assert_equal(2, (1..2).max)
     assert_equal(nil, (2..1).max)
     assert_equal(1, (1...2).max)
+    assert_equal(18446744073709551615, (0...2**64).max)
 
     assert_equal(2.0, (1.0..2.0).max)
     assert_equal(nil, (2.0..1.0).max)

Original file line number	Diff line number	Diff line change
`@@ -659,7 +659,11 @@ public IRubyObject max(ThreadContext context, Block block) {`
`659`	`659`	`if (!(begin instanceof RubyInteger)) {`
`660`	`660`	`throw context.runtime.newTypeError("cannot exclude end value with non Integer begin value");`
`661`	`661`	`}`
`662`		`- rangeEnd = RubyFixnum.newFixnum(context.runtime, ((RubyInteger) end).getLongValue() - 1);`
	`662`	`+ if (end instanceof RubyFixnum) {`
	`663`	`+ rangeEnd = RubyFixnum.newFixnum(context.runtime, ((RubyFixnum)end).getLongValue() - 1);`
	`664`	`+ } else {`
	`665`	`+ rangeEnd = end.callMethod(context, "-", RubyFixnum.one(context.runtime));`
	`666`	`+ }`
`663`	`667`	`} else {`
`664`	`668`	`rangeEnd = end;`
`665`	`669`	`}`