Merge branch 'master' of https://github.com/RustPython/RustPython

Author: windelbouwman

tests/snippets/builtin_bin.py

@@ -0,0 +1,13 @@
+assert bin(0) == '0b0'
+assert bin(1) == '0b1'
+assert bin(-1) == '-0b1'
+assert bin(2**24) == '0b1' + '0' * 24
+assert bin(2**24-1) == '0b' + '1' * 24
+assert bin(-(2**24)) == '-0b1' + '0' * 24
+assert bin(-(2**24-1)) == '-0b' + '1' * 24
+
+# TODO: uncomment these tests when arbitrarily sized ints are supported
+# assert bin(2**65) == '0b1' + '0' * 65
+# assert bin(2**65-1) == '0b' + '1' * 65
+# assert bin(-(2**65)) == '-0b1' + '0' * 65
+# assert bin(-(2**65-1)) == '-0b' + '1' * 65

tests/snippets/builtin_hex.py

@@ -0,0 +1,9 @@
+assert hex(16) == '0x10'
+assert hex(-16) == '-0x10'
+
+try:
+    hex({})
+except TypeError:
+    pass
+else:
+    assert False, "TypeError not raised when ord() is called with a dict"

tests/snippets/floats.py

@@ -11,3 +11,7 @@
 assert b > a
 assert not a > b
 assert not a > c
+assert b >= a
+assert c >= a
+assert not a >= b
+

vm/src/builtins.rs

@@ -5,6 +5,7 @@ use std::io::{self, Write};
 
 use super::compile;
 use super::obj::objbool;
+use super::obj::objint;
 use super::obj::objiter;
 use super::obj::objstr;
 use super::obj::objtype;
@@ -74,7 +75,19 @@ fn builtin_any(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
 }
 
 // builtin_ascii
-// builtin_bin
+
+fn builtin_bin(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
+    arg_check!(vm, args, required = [(number, Some(vm.ctx.int_type()))]);
+
+    let n = objint::get_value(number);
+    let s = match n.signum() {
+        -1 => format!("-0b{:b}", n.abs()),
+        _ => format!("0b{:b}", n),
+    };
+
+    Ok(vm.new_str(s))
+}
+
 // builtin_bool
 // builtin_breakpoint
 // builtin_bytearray
@@ -244,7 +257,18 @@ fn builtin_hash(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
 }
 
 // builtin_help
-// builtin_hex
+
+fn builtin_hex(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
+    arg_check!(vm, args, required = [(number, Some(vm.ctx.int_type()))]);
+
+    let n = objint::get_value(number);
+    let s = match n.signum() {
+        -1 => format!("-0x{:x}", n.abs()),
+        _ => format!("0x{:x}", n),
+    };
+
+    Ok(vm.new_str(s))
+}
 
 fn builtin_id(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
     arg_check!(vm, args, required = [(obj, None)]);
@@ -514,6 +538,7 @@ pub fn make_module(ctx: &PyContext) -> PyObjectRef {
     dict.insert(String::from("abs"), ctx.new_rustfunc(builtin_abs));
     dict.insert(String::from("all"), ctx.new_rustfunc(builtin_all));
     dict.insert(String::from("any"), ctx.new_rustfunc(builtin_any));
+    dict.insert(String::from("bin"), ctx.new_rustfunc(builtin_bin));
     dict.insert(String::from("bool"), ctx.bool_type());
     dict.insert(String::from("bytes"), ctx.bytes_type());
     dict.insert(String::from("chr"), ctx.new_rustfunc(builtin_chr));
@@ -527,6 +552,7 @@ pub fn make_module(ctx: &PyContext) -> PyObjectRef {
     dict.insert(String::from("getattr"), ctx.new_rustfunc(builtin_getattr));
     dict.insert(String::from("hasattr"), ctx.new_rustfunc(builtin_hasattr));
     dict.insert(String::from("hash"), ctx.new_rustfunc(builtin_hash));
+    dict.insert(String::from("hex"), ctx.new_rustfunc(builtin_hex));
     dict.insert(String::from("id"), ctx.new_rustfunc(builtin_id));
     dict.insert(String::from("int"), ctx.int_type());
     dict.insert(

vm/src/obj/objfloat.rs

@@ -106,6 +106,21 @@ fn float_gt(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
     Ok(vm.ctx.new_bool(result))
 }
 
+fn float_ge(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()))
@@ -220,6 +235,7 @@ pub fn init(context: &PyContext) {
     float_type.set_attr("__lt__", context.new_rustfunc(float_lt));
     float_type.set_attr("__le__", context.new_rustfunc(float_le));
     float_type.set_attr("__gt__", context.new_rustfunc(float_gt));
+    float_type.set_attr("__ge__", context.new_rustfunc(float_ge));
     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));