Merge pull request #523 from AdamGS/complex_and_ints_addition

OddCoincidence · web-flow · commit 2df741452b6a · 2019-02-22T07:34:47.000-08:00
Complex and ints addition
diff --git a/tests/snippets/builtin_complex.py b/tests/snippets/builtin_complex.py
@@ -38,3 +38,9 @@
 
 assert a.imag == 4
 assert b.imag == 4
+
+# int and complex addition
+assert 1 + 1j == complex(1, 1)
+assert 1j + 1 == complex(1, 1)
+assert (1j + 1) + 3 == complex(4, 1)
+assert 3 + (1j + 1) == complex(4, 1)
diff --git a/vm/src/obj/objcomplex.rs b/vm/src/obj/objcomplex.rs
@@ -17,6 +17,11 @@ pub fn init(context: &PyContext) {
 
     context.set_attr(&complex_type, "__abs__", context.new_rustfunc(complex_abs));
     context.set_attr(&complex_type, "__add__", context.new_rustfunc(complex_add));
+    context.set_attr(
+        &complex_type,
+        "__radd__",
+        context.new_rustfunc(complex_radd),
+    );
     context.set_attr(&complex_type, "__eq__", context.new_rustfunc(complex_eq));
     context.set_attr(&complex_type, "__neg__", context.new_rustfunc(complex_neg));
     context.set_attr(&complex_type, "__new__", context.new_rustfunc(complex_new));
@@ -106,6 +111,30 @@ fn complex_add(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
     let v1 = get_value(i);
     if objtype::isinstance(i2, &vm.ctx.complex_type()) {
         Ok(vm.ctx.new_complex(v1 + get_value(i2)))
+    } else if objtype::isinstance(i2, &vm.ctx.int_type()) {
+        Ok(vm.ctx.new_complex(Complex64::new(
+            v1.re + objint::get_value(i2).to_f64().unwrap(),
+            v1.im,
+        )))
+    } else {
+        Err(vm.new_type_error(format!("Cannot add {} and {}", i.borrow(), i2.borrow())))
+    }
+}
+
+fn complex_radd(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
+    arg_check!(
+        vm,
+        args,
+        required = [(i, Some(vm.ctx.complex_type())), (i2, None)]
+    );
+
+    let v1 = get_value(i);
+
+    if objtype::isinstance(i2, &vm.ctx.int_type()) {
+        Ok(vm.ctx.new_complex(Complex64::new(
+            v1.re + objint::get_value(i2).to_f64().unwrap(),
+            v1.im,
+        )))
     } else {
         Err(vm.new_type_error(format!("Cannot add {} and {}", i.borrow(), i2.borrow())))
     }
