Fix: 'divmod' builtin did not handle error case.

Author: fangerer

graalpython/com.oracle.graal.python.test/src/tests/test_binary_arithmetic.py

@@ -133,6 +133,21 @@ def test_floor_div():
     assert_exception(lambda: 5.4 // 0.0, ZeroDivisionError)
 
 
+def test_divmod():
+    class Floatable:
+        def __init__(self, val):
+            self.val = val
+        def __float__(self):
+            return self.val
+
+    def doDivmod(a, b):
+        return divmod(a, b)
+
+    argList = [(Floatable(3), Floatable(4)), (complex(1,2), complex(3,4))]
+    for args in argList:
+        assert_exception(lambda: doDivmod(*args), TypeError)
+
+
 def test_subclass_ordered_binop():
     class A(int):
         def __add__(self, other):

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinFunctions.java

@@ -98,7 +98,6 @@
 import com.oracle.graal.python.builtins.objects.common.PHashingCollection;
 import com.oracle.graal.python.builtins.objects.common.SequenceNodes;
 import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodes;
-import com.oracle.graal.python.builtins.objects.complex.PComplex;
 import com.oracle.graal.python.builtins.objects.dict.PDict;
 import com.oracle.graal.python.builtins.objects.frame.FrameBuiltins.GetLocalsNode;
 import com.oracle.graal.python.builtins.objects.function.Arity;
@@ -176,6 +175,7 @@
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Fallback;
 import com.oracle.truffle.api.dsl.GenerateNodeFactory;
+import com.oracle.truffle.api.dsl.ImportStatic;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.dsl.TypeSystemReference;
 import com.oracle.truffle.api.frame.Frame;
@@ -498,7 +498,8 @@ private ListAppendNode getAppendNode() {
     @Builtin(name = DIVMOD, fixedNumOfPositionalArgs = 2)
     @TypeSystemReference(PythonArithmeticTypes.class)
     @GenerateNodeFactory
-    public abstract static class DivModNode extends PythonBuiltinNode {
+    @ImportStatic(BinaryArithmetic.class)
+    public abstract static class DivModNode extends PythonBinaryBuiltinNode {
         @Specialization(guards = "b != 0")
         public PTuple doLong(long a, long b) {
             return factory().createTuple(new Object[]{Math.floorDiv(a, b), Math.floorMod(a, b)});
@@ -518,22 +519,10 @@ public PTuple doDouble(double a, double b) {
             return factory().createTuple(new Object[]{q, a % b});
         }
 
-        @Specialization
-        @SuppressWarnings("unused")
-        public PTuple doComplex(PComplex c, Object o) {
-            throw raise(PythonErrorType.TypeError, "can't take floor or mod of complex number.");
-        }
-
-        @Specialization
-        @SuppressWarnings("unused")
-        public PTuple doComplex(Object o, PComplex c) {
-            throw raise(PythonErrorType.TypeError, "can't take floor or mod of complex number.");
-        }
-
         @Specialization
         public PTuple doObject(Object a, Object b,
-                        @Cached("create(__FLOORDIV__)") LookupAndCallBinaryNode floordivNode,
-                        @Cached("create(__MOD__)") LookupAndCallBinaryNode modNode) {
+                        @Cached("FloorDiv.create()") LookupAndCallBinaryNode floordivNode,
+                        @Cached("Mod.create()") LookupAndCallBinaryNode modNode) {
             Object div = floordivNode.executeObject(a, b);
             Object mod = modNode.executeObject(a, b);
             return factory().createTuple(new Object[]{div, mod});