invent a signum() helper (for now only on Integer) and start using it

kares · kares · commit 2245c4faccb9 · 2017-07-06T12:12:56.000+02:00
diff --git a/core/src/main/java/org/jruby/RubyBignum.java b/core/src/main/java/org/jruby/RubyBignum.java
@@ -138,6 +138,9 @@ public BigInteger getValue() {
         return value;
     }
 
+    @Override
+    public int signum() { return value.signum(); }
+
     /*  ================
      *  Utility Methods
      *  ================
@@ -255,8 +258,7 @@ public IRubyObject to_s(IRubyObject[] args) {
     @JRubyMethod(name = "to_s", alias = "inspect")
     @Override
     public IRubyObject to_s() {
-        int base = 10;
-        return RubyString.newUSASCIIString(getRuntime(), getValue().toString(base));
+        return RubyString.newUSASCIIString(getRuntime(), getValue().toString(10));
     }
 
     @JRubyMethod(name = "to_s")
diff --git a/core/src/main/java/org/jruby/RubyFixnum.java b/core/src/main/java/org/jruby/RubyFixnum.java
@@ -199,6 +199,9 @@ public BigInteger getBigIntegerValue() {
         return BigInteger.valueOf(value);
     }
 
+    @Override
+    public int signum() { return Long.signum(value); }
+
     public static RubyFixnum newFixnum(Ruby runtime, long value) {
         if (USE_CACHE && isInCacheRange(value)) {
             return cachedFixnum(runtime, value);
diff --git a/core/src/main/java/org/jruby/RubyInteger.java b/core/src/main/java/org/jruby/RubyInteger.java
@@ -110,6 +110,8 @@ protected RubyFloat toFloat() {
         return RubyFloat.newFloat(getRuntime(), getDoubleValue());
     }
 
+    public int signum() { return getBigIntegerValue().signum(); }
+
     /*  ================
      *  Instance Methods
      *  ================
diff --git a/core/src/main/java/org/jruby/RubyRational.java b/core/src/main/java/org/jruby/RubyRational.java
@@ -632,7 +632,7 @@ public IRubyObject op_expt(ThreadContext context, IRubyObject other) {
 
         // General case
         if (other instanceof RubyFixnum || other instanceof RubyBignum) {
-            return fix_expt(context, (RubyInteger) other, ((RubyInteger) other).getBigIntegerValue().signum());
+            return fix_expt(context, (RubyInteger) other, ((RubyInteger) other).signum());
         }
         if (other instanceof RubyFloat || other instanceof RubyRational) {
             return f_expt(context, f_to_f(context, this), other);
diff --git a/core/src/main/java/org/jruby/util/Numeric.java b/core/src/main/java/org/jruby/util/Numeric.java
@@ -334,15 +334,15 @@ public static IRubyObject f_lshift(ThreadContext context, IRubyObject x, IRubyOb
      * 
      */
     public static boolean f_negative_p(ThreadContext context, IRubyObject x) {
-        if (x instanceof RubyFixnum) return ((RubyFixnum)x).getLongValue() < 0;
+        if (x instanceof RubyInteger) return ((RubyInteger) x).signum() == -1;
         return sites(context).op_lt.call(context, x, x, RubyFixnum.zero(context.runtime)).isTrue();
     }
     
     /** f_zero_p
      * 
      */
     public static boolean f_zero_p(ThreadContext context, IRubyObject x) {
-        if (x instanceof RubyFixnum) return ((RubyFixnum)x).getLongValue() == 0;
+        if (x instanceof RubyInteger) return ((RubyInteger) x).signum() == 0;
         return sites(context).op_equals.call(context, x, x, RubyFixnum.zero(context.runtime)).isTrue();
     }
     

Original file line number	Diff line number	Diff line change
`@@ -199,6 +199,9 @@ public BigInteger getBigIntegerValue() {`
`199`	`199`	`return BigInteger.valueOf(value);`
`200`	`200`	`}`
`201`	`201`
	`202`	`+ @Override`
	`203`	`+ public int signum() { return Long.signum(value); }`
	`204`	`+`
`202`	`205`	`public static RubyFixnum newFixnum(Ruby runtime, long value) {`
`203`	`206`	`if (USE_CACHE && isInCacheRange(value)) {`
`204`	`207`	`return cachedFixnum(runtime, value);`
Original file line number	Diff line number	Diff line change
`@@ -110,6 +110,8 @@ protected RubyFloat toFloat() {`
`110`	`110`	`return RubyFloat.newFloat(getRuntime(), getDoubleValue());`
`111`	`111`	`}`
`112`	`112`
	`113`	`+ public int signum() { return getBigIntegerValue().signum(); }`
	`114`	`+`
`113`	`115`	`/* ================`
`114`	`116`	`* Instance Methods`
`115`	`117`	`* ================`
Original file line number	Diff line number	Diff line change
`@@ -632,7 +632,7 @@ public IRubyObject op_expt(ThreadContext context, IRubyObject other) {`
`632`	`632`
`633`	`633`	`// General case`
`634`	`634`	`if (other instanceof RubyFixnum \|\| other instanceof RubyBignum) {`
`635`		`- return fix_expt(context, (RubyInteger) other, ((RubyInteger) other).getBigIntegerValue().signum());`
	`635`	`+ return fix_expt(context, (RubyInteger) other, ((RubyInteger) other).signum());`
`636`	`636`	`}`
`637`	`637`	`if (other instanceof RubyFloat \|\| other instanceof RubyRational) {`
`638`	`638`	`return f_expt(context, f_to_f(context, this), other);`
Original file line number	Diff line number	Diff line change
`@@ -334,15 +334,15 @@ public static IRubyObject f_lshift(ThreadContext context, IRubyObject x, IRubyOb`
`334`	`334`	`*`
`335`	`335`	`*/`
`336`	`336`	`public static boolean f_negative_p(ThreadContext context, IRubyObject x) {`
`337`		`- if (x instanceof RubyFixnum) return ((RubyFixnum)x).getLongValue() < 0;`
	`337`	`+ if (x instanceof RubyInteger) return ((RubyInteger) x).signum() == -1;`
`338`	`338`	`return sites(context).op_lt.call(context, x, x, RubyFixnum.zero(context.runtime)).isTrue();`
`339`	`339`	`}`
`340`	`340`
`341`	`341`	`/** f_zero_p`
`342`	`342`	`*`
`343`	`343`	`*/`
`344`	`344`	`public static boolean f_zero_p(ThreadContext context, IRubyObject x) {`
`345`		`- if (x instanceof RubyFixnum) return ((RubyFixnum)x).getLongValue() == 0;`
	`345`	`+ if (x instanceof RubyInteger) return ((RubyInteger) x).signum() == 0;`
`346`	`346`	`return sites(context).op_equals.call(context, x, x, RubyFixnum.zero(context.runtime)).isTrue();`
`347`	`347`	`}`
`348`	`348`