Merge pull request RustPython#408 from janczer/add_floats_div_mul

Add floats.{__truediv__, __mul__}

Author: cthulahoops

tests/snippets/floats.py

@@ -15,3 +15,6 @@
 assert c >= a
 assert not a >= b
 
+assert a + b == 2.5
+assert a - c == 0
+assert a / c == 1

vm/src/obj/objfloat.rs

@@ -266,6 +266,46 @@ fn float_pow(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
     }
 }
 
+fn float_truediv(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
+    arg_check!(
+        vm,
+        args,
+        required = [(i, Some(vm.ctx.float_type())), (i2, None)]
+    );
+    let v1 = get_value(i);
+    if objtype::isinstance(i2, &vm.ctx.float_type) {
+        Ok(vm.ctx.new_float(v1 / get_value(i2)))
+    } else if objtype::isinstance(i2, &vm.ctx.int_type) {
+        Ok(vm
+            .ctx
+            .new_float(v1 / objint::get_value(i2).to_f64().unwrap()))
+    } else {
+        Err(vm.new_type_error(format!("Cannot divide {} and {}", i.borrow(), i2.borrow())))
+    }
+}
+
+fn float_mul(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
+    arg_check!(
+        vm,
+        args,
+        required = [(i, Some(vm.ctx.float_type())), (i2, None)]
+    );
+    let v1 = get_value(i);
+    if objtype::isinstance(i2, &vm.ctx.float_type) {
+        Ok(vm.ctx.new_float(v1 * get_value(i2)))
+    } else if objtype::isinstance(i2, &vm.ctx.int_type) {
+        Ok(vm
+            .ctx
+            .new_float(v1 * objint::get_value(i2).to_f64().unwrap()))
+    } else {
+        Err(vm.new_type_error(format!(
+            "Cannot multiply {} and {}",
+            i.borrow(),
+            i2.borrow()
+        )))
+    }
+}
+
 pub fn init(context: &PyContext) {
     let float_type = &context.float_type;
 
@@ -299,4 +339,10 @@ pub fn init(context: &PyContext) {
         "__doc__",
         context.new_str(float_doc.to_string()),
     );
+    context.set_attr(
+        &float_type,
+        "__truediv__",
+        context.new_rustfunc(float_truediv),
+    );
+    context.set_attr(&float_type, "__mul__", context.new_rustfunc(float_mul));
 }