From 6274c3fe8bb6498a1ecf654360c0ea1495b45a82 Mon Sep 17 00:00:00 2001 From: Aviv Palivoda Date: Fri, 8 Feb 2019 17:18:14 +0200 Subject: [PATCH] Add set.__ge__ --- tests/snippets/set.py | 2 ++ vm/src/obj/objset.rs | 23 +++++++++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 tests/snippets/set.py diff --git a/tests/snippets/set.py b/tests/snippets/set.py new file mode 100644 index 000000000..eda3e7702 --- /dev/null +++ b/tests/snippets/set.py @@ -0,0 +1,2 @@ +assert set([1,2,3]) >= set([1,2]) +assert not set([1,3]) >= set([1,2]) diff --git a/vm/src/obj/objset.rs b/vm/src/obj/objset.rs index 5ac7507d6..85a01e294 100644 --- a/vm/src/obj/objset.rs +++ b/vm/src/obj/objset.rs @@ -126,6 +126,28 @@ pub fn set_contains(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult { Ok(vm.new_bool(false)) } +fn set_ge(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult { + arg_check!( + vm, + args, + required = [ + (zelf, Some(vm.ctx.set_type())), + (other, Some(vm.ctx.set_type())) + ] + ); + for element in get_elements(other).iter() { + match vm.call_method(zelf, "__contains__", vec![element.1.clone()]) { + Ok(value) => { + if !objbool::get_value(&value) { + return Ok(vm.new_bool(false)); + } + } + Err(_) => return Err(vm.new_type_error("".to_string())), + } + } + Ok(vm.new_bool(true)) +} + fn frozenset_repr(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult { arg_check!(vm, args, required = [(o, Some(vm.ctx.frozenset_type()))]); @@ -159,6 +181,7 @@ pub fn init(context: &PyContext) { context.set_attr(&set_type, "__len__", context.new_rustfunc(set_len)); context.set_attr(&set_type, "__new__", context.new_rustfunc(set_new)); context.set_attr(&set_type, "__repr__", context.new_rustfunc(set_repr)); + context.set_attr(&set_type, "__ge__", context.new_rustfunc(set_ge)); context.set_attr(&set_type, "__doc__", context.new_str(set_doc.to_string())); context.set_attr(&set_type, "add", context.new_rustfunc(set_add));