Merge pull request #534 from AdamGS/new_float_attributes

OddCoincidence · web-flow · commit cbcf7c3e755d · 2019-02-23T22:19:37.000-08:00
Addred real property and is_integer function to float.
diff --git a/tests/snippets/floats.py b/tests/snippets/floats.py
@@ -83,3 +83,7 @@
 assert 1.0.__rtruediv__(2) == 2.0
 assert 2.0.__mul__(1) == 2.0
 assert 2.0.__rsub__(1) == -1.0
+
+assert (1.7).real == 1.7
+assert (1.3).is_integer() == False
+assert (1.0).is_integer()    == True
diff --git a/vm/src/obj/objfloat.rs b/vm/src/obj/objfloat.rs
@@ -418,6 +418,19 @@ fn float_rmul(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
     float_mul(vm, args)
 }
 
+fn float_real(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
+    arg_check!(vm, args, required = [(i, Some(vm.ctx.float_type()))]);
+    let v = get_value(i);
+    Ok(vm.ctx.new_float(v))
+}
+
+fn float_is_integer(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
+    arg_check!(vm, args, required = [(i, Some(vm.ctx.float_type()))]);
+    let v = get_value(i);
+    let result = v == v.round();
+    Ok(vm.ctx.new_bool(result))
+}
+
 pub fn init(context: &PyContext) {
     let float_type = &context.float_type;
 
@@ -465,4 +478,10 @@ pub fn init(context: &PyContext) {
     );
     context.set_attr(&float_type, "__mul__", context.new_rustfunc(float_mul));
     context.set_attr(&float_type, "__rmul__", context.new_rustfunc(float_rmul));
+    context.set_attr(&float_type, "real", context.new_property(float_real));
+    context.set_attr(
+        &float_type,
+        "is_integer",
+        context.new_rustfunc(float_is_integer),
+    );
 }
