jruby · Jul 10, 2017 · Jul 10, 2017 · Jul 10, 2017
Showing with 27 additions and 13 deletions.

+2 −3 core/src/main/java/org/jruby/RubyFloat.java

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

+20 −6 core/src/main/java/org/jruby/RubyRange.java

+2 −1 core/src/main/java/org/jruby/util/Numeric.java
diff --git a/core/src/main/java/org/jruby/RubyFloat.java b/core/src/main/java/org/jruby/RubyFloat.java
@@ -180,9 +180,8 @@ public RubyFloat convertToFloat() {
     	return this;
     }
 
-    protected int compareValue(RubyNumeric other) {
-        double otherVal = other.getDoubleValue();
-        return getValue() > otherVal ? 1 : getValue() < otherVal ? -1 : 0;
+    public int signum() {
+        return (int) Math.signum(value); // NOTE: (int) NaN ?
     }
 
     public static RubyFloat newFloat(Ruby runtime, double value) {

diff --git a/core/src/main/java/org/jruby/RubyNumeric.java b/core/src/main/java/org/jruby/RubyNumeric.java
@@ -189,9 +189,9 @@ private static void tooBig(IRubyObject arg, long num) {
      */
     public static byte num2chr(IRubyObject arg) {
         if (arg instanceof RubyString) {
-            String value = arg.toString();
-
-            if (value != null && value.length() > 0) return (byte) value.charAt(0);
+            if (((RubyString) arg).size() > 0) {
+                return (byte) ((RubyString) arg).getByteList().get(0);
+            }
         }
 
         return (byte) num2int(arg);

diff --git a/core/src/main/java/org/jruby/RubyRange.java b/core/src/main/java/org/jruby/RubyRange.java
@@ -301,8 +301,8 @@ public RubyFixnum hash(ThreadContext context) {
         return context.runtime.newFixnum(hash);
     }
 
-    private IRubyObject inspectValue(final ThreadContext context, IRubyObject value) {
-        return context.safeRecurse(INSPECT_RECURSIVE, value, value, "inspect", true);
+    private static RubyString inspectValue(final ThreadContext context, IRubyObject value) {
+        return (RubyString) context.safeRecurse(INSPECT_RECURSIVE, value, value, "inspect", true);
     }
 
     private static class InspectRecursive implements ThreadContext.RecursiveFunctionEx<IRubyObject> {
@@ -319,20 +319,34 @@ public IRubyObject call(ThreadContext context, IRubyObject state, IRubyObject ob
 
     private static final byte[] DOTDOTDOT = new byte[]{'.', '.', '.'};
 
+    @Override
+    public IRubyObject inspect() {
+        return inspect(getRuntime().getCurrentContext());
+    }
+
     @JRubyMethod(name = "inspect")
-    public IRubyObject inspect(final ThreadContext context) {
-        RubyString i1 = ((RubyString) inspectValue(context, begin)).strDup(context.runtime);
-        RubyString i2 = (RubyString) inspectValue(context, end);
+    public RubyString inspect(final ThreadContext context) {
+        RubyString i1 = inspectValue(context, begin).strDup(context.runtime);
+        RubyString i2 = inspectValue(context, end);
         i1.cat(DOTDOTDOT, 0, isExclusive ? 3 : 2);
         i1.append(i2);
         i1.infectBy(i2);
         i1.infectBy(this);
         return i1;
     }
 
+    @Override
+    public IRubyObject to_s() {
+        return to_s(getRuntime());
+    }
+
     @JRubyMethod(name = "to_s")
     public IRubyObject to_s(final ThreadContext context) {
-        RubyString i1 = begin.asString().strDup(context.runtime);
+        return to_s(context.runtime);
+    }
+
+    private RubyString to_s(final Ruby runtime) {
+        RubyString i1 = begin.asString().strDup(runtime);
         RubyString i2 = end.asString();
         i1.cat(DOTDOTDOT, 0, isExclusive ? 3 : 2);
         i1.append(i2);

diff --git a/core/src/main/java/org/jruby/util/Numeric.java b/core/src/main/java/org/jruby/util/Numeric.java
@@ -68,7 +68,7 @@ public static IRubyObject f_cmp(ThreadContext context, IRubyObject x, IRubyObjec
      * 
      */
     public static IRubyObject f_div(ThreadContext context, IRubyObject x, IRubyObject y) {
-        if (y instanceof RubyFixnum && ((RubyFixnum)y).getLongValue() == 1) return x;
+        if (y instanceof RubyFixnum && ((RubyFixnum) y).getLongValue() == 1) return x;
         return sites(context).op_quo.call(context, x, x, y);
     }
 
@@ -343,6 +343,7 @@ public static boolean f_negative_p(ThreadContext context, IRubyObject x) {
      */
     public static boolean f_zero_p(ThreadContext context, IRubyObject x) {
         if (x instanceof RubyInteger) return ((RubyInteger) x).signum() == 0;
+        if (x instanceof RubyFloat) return ((RubyFloat) x).signum() == 0;
         return sites(context).op_equals.call(context, x, x, RubyFixnum.zero(context.runtime)).isTrue();
     }