Merge branch 'master' into bojan/objfloat-__lt__

BojanKogoj · BojanKogoj · commit 3077d7b22c5a · 2018-10-27T15:57:00.000+02:00
diff --git a/vm/src/obj/objfloat.rs b/vm/src/obj/objfloat.rs
@@ -77,6 +77,21 @@ fn float_lt(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
 }
 
 
+fn float_le(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
+    arg_check!(
+        vm,
+        args,
+        required = [
+            (zelf, Some(vm.ctx.float_type())),
+            (other, Some(vm.ctx.float_type()))
+        ]
+    );
+    let zelf = get_value(zelf);
+    let other = get_value(other);
+    let result = zelf <= other;
+    Ok(vm.ctx.new_bool(result))
+}
+
 fn float_abs(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
     arg_check!(vm, args, required = [(i, Some(vm.ctx.float_type()))]);
     Ok(vm.ctx.new_float(get_value(i).abs()))
@@ -188,6 +203,7 @@ pub fn init(context: &PyContext) {
     let ref float_type = context.float_type;
     float_type.set_attr("__eq__", context.new_rustfunc(float_eq));
     float_type.set_attr("__lt__", context.new_rustfunc(float_lt));
+    float_type.set_attr("__le__", context.new_rustfunc(float_le));
     float_type.set_attr("__abs__", context.new_rustfunc(float_abs));
     float_type.set_attr("__add__", context.new_rustfunc(float_add));
     float_type.set_attr("__divmod__", context.new_rustfunc(float_divmod));
