Restore logic for Fixnum#remainder.

jruby · Feb 28, 2018 · d735053 · d735053
1 parent 52fbb08
commit d735053
Showing 3 changed files with 11 additions and 0 deletions.
diff --git a/core/src/main/java/org/jruby/RubyFixnum.java b/core/src/main/java/org/jruby/RubyFixnum.java
@@ -1378,11 +1378,17 @@ public IRubyObject denominator(ThreadContext context) {
         return one(context.runtime);
     }
 
+    @Override
     public RubyRational convertToRational() {
         final Ruby runtime = getRuntime();
         return RubyRational.newRationalRaw(runtime, this, one(runtime));
     }
 
+    @Override
+    public IRubyObject remainder(ThreadContext context, IRubyObject y) {
+        return numRemainder(context, y);
+    }
+
     private static JavaSites.FixnumSites sites(ThreadContext context) {
         return context.sites.Fixnum;
     }

diff --git a/core/src/main/java/org/jruby/RubyInteger.java b/core/src/main/java/org/jruby/RubyInteger.java
@@ -797,6 +797,7 @@ public IRubyObject op_ge(ThreadContext context, IRubyObject other) {
     public IRubyObject op_le(ThreadContext context, IRubyObject other) {
         return RubyComparable.op_le(context, this, other);
     }
+
     @JRubyMethod(name = "remainder")
     public IRubyObject remainder(ThreadContext context, IRubyObject dividend) {
         return context.nil;

diff --git a/core/src/main/java/org/jruby/RubyNumeric.java b/core/src/main/java/org/jruby/RubyNumeric.java
@@ -803,6 +803,10 @@ public IRubyObject modulo(ThreadContext context, IRubyObject other) {
      */
     @JRubyMethod(name = "remainder")
     public IRubyObject remainder(ThreadContext context, IRubyObject y) {
+        return numRemainder(context, y);
+    }
+
+    public IRubyObject numRemainder(ThreadContext context, IRubyObject y) {
         RubyNumeric x = this;
         JavaSites.NumericSites sites = sites(context);
         IRubyObject z = sites.op_mod.call(context, this, this, y);