Implement coercion for all BigDecimal operations

* Except for operations that MRI does not support yet like #** and #sqrt.

Author: eregon

src/main/java/org/truffleruby/stdlib/bigdecimal/BigDecimalNodes.java

@@ -84,10 +84,7 @@ public Object addSpecial(VirtualFrame frame, DynamicObject a, DynamicObject b) {
             return addSpecial(frame, a, b, 0);
         }
 
-        @Specialization(guards = {
-                "isRubyBigDecimal(a)",
-                "!isRubyBigDecimal(b)"
-        })
+        @Specialization(guards = "!isRubyBigDecimal(b)")
         public Object addCoerced(DynamicObject a, Object b,
                 @Cached("createPrivate()") CallDispatchHeadNode redoCoerced) {
             return redoCoerced.call(a, "redo_coerced", coreStrings().PLUS.getSymbol(), b);
@@ -115,6 +112,12 @@ protected Object add(VirtualFrame frame, DynamicObject a, DynamicObject b, int p
         protected Object addSpecial(VirtualFrame frame, DynamicObject a, DynamicObject b, int precision) {
             return super.addSpecial(frame, a, b, precision);
         }
+
+        @Specialization(guards = "!isRubyBigDecimal(b)")
+        public Object addCoerced(DynamicObject a, Object b, int precision,
+                                 @Cached("createPrivate()") CallDispatchHeadNode redoCoerced) {
+            return redoCoerced.call(a, "redo_coerced", getSymbol("add"), b, precision);
+        }
     }
 
     @CoreMethod(names = "-", required = 1)
@@ -136,10 +139,7 @@ public Object subSpecial(VirtualFrame frame, DynamicObject a, DynamicObject b) {
             return subSpecial(frame, a, b, 0);
         }
 
-        @Specialization(guards = {
-                "isRubyBigDecimal(a)",
-                "!isRubyBigDecimal(b)"
-        })
+        @Specialization(guards = "!isRubyBigDecimal(b)")
         public Object subCoerced(DynamicObject a, Object b,
                 @Cached("createPrivate()") CallDispatchHeadNode redoCoerced) {
             return redoCoerced.call(a, "redo_coerced", coreStrings().MINUS.getSymbol(), b);
@@ -167,6 +167,12 @@ public Object subNormal(VirtualFrame frame, DynamicObject a, DynamicObject b, in
         public Object subSpecial(VirtualFrame frame, DynamicObject a, DynamicObject b, int precision) {
             return super.subSpecial(frame, a, b, precision);
         }
+
+        @Specialization(guards = "!isRubyBigDecimal(b)")
+        public Object subCoerced(DynamicObject a, Object b, int precision,
+                                 @Cached("createPrivate()") CallDispatchHeadNode redoCoerced) {
+            return redoCoerced.call(a, "redo_coerced", getSymbol("sub"), b, precision);
+        }
     }
 
     @CoreMethod(names = "-@")
@@ -252,6 +258,12 @@ public Object multSpecialNormal(VirtualFrame frame, DynamicObject a, DynamicObje
         public Object multSpecial(VirtualFrame frame, DynamicObject a, DynamicObject b) {
             return multSpecial(frame, a, b, 0);
         }
+
+        @Specialization(guards = "!isRubyBigDecimal(b)")
+        public Object multCoerced(DynamicObject a, Object b,
+                                 @Cached("createPrivate()") CallDispatchHeadNode redoCoerced) {
+            return redoCoerced.call(a, "redo_coerced", coreStrings().MULTIPLY.getSymbol(), b);
+        }
     }
 
     @CoreMethod(names = "mult", required = 2, lowerFixnum = 2)
@@ -293,6 +305,12 @@ public Object multSpecialNormal(VirtualFrame frame, DynamicObject a, DynamicObje
         public Object multSpecial(VirtualFrame frame, DynamicObject a, DynamicObject b, int precision) {
             return super.multSpecial(frame, a, b, precision);
         }
+
+        @Specialization(guards = "!isRubyBigDecimal(b)")
+        public Object multCoerced(DynamicObject a, Object b, int precision,
+                                 @Cached("createPrivate()") CallDispatchHeadNode redoCoerced) {
+            return redoCoerced.call(a, "redo_coerced", getSymbol("mult"), b, precision);
+        }
     }
 
     @CoreMethod(names = { "/", "quo" }, required = 1)
@@ -330,6 +348,12 @@ public Object divSpecialNormal(VirtualFrame frame, DynamicObject a, DynamicObjec
         public Object divSpecialSpecial(VirtualFrame frame, DynamicObject a, DynamicObject b) {
             return divSpecialSpecial(frame, a, b, 0);
         }
+
+        @Specialization(guards = "!isRubyBigDecimal(b)")
+        public Object divCoerced(DynamicObject a, Object b,
+                                  @Cached("createPrivate()") CallDispatchHeadNode redoCoerced) {
+            return redoCoerced.call(a, "redo_coerced", coreStrings().DIVIDE.getSymbol(), b);
+        }
     }
 
     @CoreMethod(names = "div", required = 1, optional = 1, lowerFixnum = 2)
@@ -469,6 +493,18 @@ public Object divSpecialSpecial(
         public Object divSpecialSpecial(VirtualFrame frame, DynamicObject a, DynamicObject b, int precision) {
             return super.divSpecialSpecial(frame, a, b, precision);
         }
+
+        @Specialization(guards = "!isRubyBigDecimal(b)")
+        public Object divCoerced(DynamicObject a, Object b, NotProvided precision,
+                                 @Cached("createPrivate()") CallDispatchHeadNode redoCoerced) {
+            return redoCoerced.call(a, "redo_coerced", getSymbol("div"), b);
+        }
+
+        @Specialization(guards = "!isRubyBigDecimal(b)")
+        public Object divCoerced(DynamicObject a, Object b, int precision,
+                                 @Cached("createPrivate()") CallDispatchHeadNode redoCoerced) {
+            return redoCoerced.call(a, "redo_coerced", getSymbol("div"), b, precision);
+        }
     }
 
     @CoreMethod(names = "divmod", required = 1)
@@ -568,6 +604,12 @@ public Object divmodSpecial(
             throw new UnsupportedOperationException("unreachable code branch");
         }
 
+        @Specialization(guards = "!isRubyBigDecimal(b)")
+        public Object divmodCoerced(DynamicObject a, Object b,
+                                 @Cached("createPrivate()") CallDispatchHeadNode redoCoerced) {
+            return redoCoerced.call(a, "redo_coerced", getSymbol("divmod"), b);
+        }
+
     }
 
     @CoreMethod(names = "remainder", required = 1)
@@ -614,6 +656,12 @@ public Object remainderSpecial(
                 return createBigDecimal(frame, BigDecimalType.NAN);
             }
         }
+
+        @Specialization(guards = "!isRubyBigDecimal(b)")
+        public Object remainderCoerced(DynamicObject a, Object b,
+                                    @Cached("createPrivate()") CallDispatchHeadNode redoCoerced) {
+            return redoCoerced.call(a, "redo_coerced", getSymbol("remainder"), b);
+        }
     }
 
     @CoreMethod(names = { "modulo", "%" }, required = 1)
@@ -691,6 +739,12 @@ public Object moduloSpecial(
 
             throw new UnsupportedOperationException("unreachable code branch");
         }
+
+        @Specialization(guards = "!isRubyBigDecimal(b)")
+        public Object moduloCoerced(DynamicObject a, Object b,
+                                       @Cached("createPrivate()") CallDispatchHeadNode redoCoerced) {
+            return redoCoerced.call(a, "redo_coerced", getSymbol("modulo"), b);
+        }
     }
 
     @CoreMethod(names = { "**", "power" }, required = 1, optional = 1, lowerFixnum = { 1, 2 })

src/main/ruby/core/numeric.rb

@@ -278,9 +278,9 @@ def bit_coerce(other)
   end
   private :bit_coerce
 
-  def redo_coerced(meth, right)
+  def redo_coerced(meth, right, *extra)
     b, a = math_coerce(right)
-    a.__send__ meth, b
+    a.__send__ meth, b, *extra
   end
   private :redo_coerced