Fix edge cases in mod and complex division

carbotaniuman · carbotaniuman · commit ace2cb8f2f47 · 2020-11-11T14:33:07.000-06:00
diff --git a/Lib/test/test_fractions.py b/Lib/test/test_fractions.py
@@ -323,8 +323,6 @@ def testLimitDenominator(self):
                 ValueError, "max_denominator should be at least 1",
                 F(1).limit_denominator, i)
 
-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure
     def testConversions(self):
         self.assertTypedEquals(-1, math.trunc(F(-11, 10)))
         self.assertTypedEquals(1, math.trunc(F(11, 10)))
@@ -459,7 +457,6 @@ def testLargeArithmetic(self):
         )
 
     # TODO: RUSTPYTHON
-    @unittest.expectedFailure
     def testMixedArithmetic(self):
         self.assertTypedEquals(F(11, 10), F(1, 10) + 1)
         self.assertTypedEquals(1.1, F(1, 10) + 1.0)
diff --git a/common/src/float_ops.rs b/common/src/float_ops.rs
@@ -182,7 +182,11 @@ pub fn div(v1: f64, v2: f64) -> Option<f64> {
 
 pub fn mod_(v1: f64, v2: f64) -> Option<f64> {
     if v2 != 0.0 {
-        Some(v1 % v2)
+        let mut val = v1 % v2;
+        if (val < 0.0) != (v2 < 0.0) {
+            val += v2;
+        }
+        Some(val)
     } else {
         None
     }
diff --git a/vm/src/builtins/complex.rs b/vm/src/builtins/complex.rs
@@ -180,7 +180,7 @@ impl PyComplex {
         other: PyObjectRef,
         vm: &VirtualMachine,
     ) -> PyResult<PyArithmaticValue<Complex64>> {
-        self.op(other, |a, b| a / b, vm)
+        self.op(other, |a, b| a.fdiv(b), vm)
     }
 
     #[pymethod(name = "__rtruediv__")]

Original file line number	Diff line number	Diff line change
`@@ -180,7 +180,7 @@ impl PyComplex {`
`180`	`180`	`other: PyObjectRef,`
`181`	`181`	`vm: &VirtualMachine,`
`182`	`182`	`) -> PyResult<PyArithmaticValue<Complex64>> {`
`183`		`- self.op(other, \|a, b\| a / b, vm)`
	`183`	`+ self.op(other, \|a, b\| a.fdiv(b), vm)`
`184`	`184`	`}`
`185`	`185`
`186`	`186`	`#[pymethod(name = "__rtruediv__")]`