int.__[r]floordiv__ to use BigInt.div_floor

youknowone · youknowone · commit 039cc128527c · 2019-08-13T11:05:34.000+09:00
diff --git a/tests/snippets/ints.py b/tests/snippets/ints.py
@@ -36,7 +36,13 @@
 assert (2).__mul__(1) == 2
 assert (2).__rmul__(1) == 2
 assert (2).__truediv__(1) == 2.0
+with assertRaises(ZeroDivisionError):
+    (2).__truediv__(0)
 assert (2).__rtruediv__(1) == 0.5
+assert (-2).__floordiv__(3) == -1
+with assertRaises(ZeroDivisionError):
+    (2).__floordiv__(0)
+assert (-3).__rfloordiv__(2) == -1
 assert (-2).__divmod__(3) == (-1, 1)
 with assertRaises(ZeroDivisionError):
     (2).__divmod__(0)
diff --git a/vm/src/obj/objint.rs b/vm/src/obj/objint.rs
@@ -139,10 +139,18 @@ fn inner_pow(int1: &PyInt, int2: &PyInt, vm: &VirtualMachine) -> PyResult {
 }
 
 fn inner_mod(int1: &PyInt, int2: &PyInt, vm: &VirtualMachine) -> PyResult {
-    if int2.value != BigInt::zero() {
+    if int2.value.is_zero() {
+        Err(vm.new_zero_division_error("integer modulo by zero".to_string()))
+    } else {
         Ok(vm.ctx.new_int(&int1.value % &int2.value))
+    }
+}
+
+fn inner_floordiv(int1: &PyInt, int2: &PyInt, vm: &VirtualMachine) -> PyResult {
+    if int2.value.is_zero() {
+        Err(vm.new_zero_division_error("integer division by zero".to_string()))
     } else {
-        Err(vm.new_zero_division_error("integer modulo by zero".to_string()))
+        Ok(vm.ctx.new_int(int1.value.div_floor(&int2.value)))
     }
 }
 
@@ -280,13 +288,18 @@ impl PyInt {
     #[pymethod(name = "__floordiv__")]
     fn floordiv(&self, other: PyObjectRef, vm: &VirtualMachine) -> PyResult {
         if objtype::isinstance(&other, &vm.ctx.int_type()) {
-            let v2 = get_value(&other);
-            if *v2 != BigInt::zero() {
-                let modulo = (&self.value % v2 + v2) % v2;
-                Ok(vm.ctx.new_int((&self.value - modulo) / v2))
-            } else {
-                Err(vm.new_zero_division_error("integer floordiv by zero".to_string()))
-            }
+            let other = other.payload::<PyInt>().unwrap();
+            inner_floordiv(self, &other, &vm)
+        } else {
+            Ok(vm.ctx.not_implemented())
+        }
+    }
+
+    #[pymethod(name = "__rfloordiv__")]
+    fn rfloordiv(&self, other: PyObjectRef, vm: &VirtualMachine) -> PyResult {
+        if objtype::isinstance(&other, &vm.ctx.int_type()) {
+            let other = other.payload::<PyInt>().unwrap();
+            inner_floordiv(&other, self, &vm)
         } else {
             Ok(vm.ctx.not_implemented())
         }
