jruby · Jul 11, 2017 · Jul 11, 2017 · Jul 11, 2017
Showing with 31 additions and 7 deletions.

+1 −1 core/src/main/java/org/jruby/RubyNumeric.java

+14 −6 core/src/main/java/org/jruby/ext/bigdecimal/RubyBigDecimal.java

+16 −0 spec/ruby/library/bigdecimal/to_r_spec.rb
diff --git a/core/src/main/java/org/jruby/RubyNumeric.java b/core/src/main/java/org/jruby/RubyNumeric.java
@@ -313,7 +313,7 @@ public static RubyInteger str2inum(Ruby runtime, RubyString str, int base) {
         return str2inum(runtime, str, base, false);
     }
 
-    public static RubyNumeric int2fix(Ruby runtime, long val) {
+    public static RubyInteger int2fix(Ruby runtime, long val) {
         return RubyFixnum.newFixnum(runtime, val);
     }
 

diff --git a/core/src/main/java/org/jruby/ext/bigdecimal/RubyBigDecimal.java b/core/src/main/java/org/jruby/ext/bigdecimal/RubyBigDecimal.java
@@ -1522,14 +1522,22 @@ public IRubyObject to_f() {
         throw getRuntime().newArgumentError("signum of this rational is invalid: " + value.signum());
     }
 
+    public final IRubyObject to_int() {
+        return to_int(getRuntime());
+    }
+
+    @Override
     @JRubyMethod(name = {"to_i", "to_int"})
-    public IRubyObject to_int() {
-        checkFloatDomain();
+    public IRubyObject to_int(ThreadContext context) {
+        return to_int(context.runtime);
+    }
 
+    final RubyInteger to_int(Ruby runtime) {
+        checkFloatDomain();
         try {
-            return RubyNumeric.int2fix(getRuntime(), value.longValueExact());
-        } catch (ArithmeticException ae) {
-            return RubyBignum.bignorm(getRuntime(), value.toBigInteger());
+            return RubyNumeric.int2fix(runtime, value.longValueExact());
+        } catch (ArithmeticException ex) {
+            return RubyBignum.bignorm(runtime, value.toBigInteger());
         }
     }
 
@@ -1539,7 +1547,7 @@ public IRubyObject to_r(ThreadContext context) {
 
         int scale = value.scale();
         BigInteger numerator = value.scaleByPowerOfTen(scale).toBigInteger();
-        BigInteger denominator = BigInteger.valueOf((long) Math.pow(10, scale));
+        BigInteger denominator = BigInteger.TEN.pow(scale);
 
         return RubyRational.newInstance(context, context.runtime.getRational(), RubyBignum.newBignum(context.runtime, numerator), RubyBignum.newBignum(context.runtime, denominator));
     }

diff --git a/spec/ruby/library/bigdecimal/to_r_spec.rb b/spec/ruby/library/bigdecimal/to_r_spec.rb
@@ -0,0 +1,16 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+require 'bigdecimal'
+
+describe "BigDecimal#to_r" do
+
+  it "returns a Rational" do
+    BigDecimal("3.14159").to_r.should be_kind_of(Rational)
+  end
+
+  it "returns a Rational with bignum values" do
+    r = BigDecimal.new("3.141592653589793238462643").to_r
+    r.numerator.should eql(3141592653589793238462643)
+    r.denominator.should eql(1000000000000000000000000)
+  end
+
+end