Changed to proper implementation in vm

BojanKogoj · BojanKogoj · commit e7cd83240c66 · 2018-11-07T22:32:20.000+01:00
diff --git a/vm/src/obj/objobject.rs b/vm/src/obj/objobject.rs
@@ -101,24 +101,12 @@ pub fn init(context: &PyContext) {
     object.set_attr("__hash__", context.new_rustfunc(object_hash));
     object.set_attr("__str__", context.new_rustfunc(object_str));
     object.set_attr("__repr__", context.new_rustfunc(object_repr));
-    object.set_attr("__and__", context.new_rustfunc(object_and));
 }
 
 fn object_init(vm: &mut VirtualMachine, _args: PyFuncArgs) -> PyResult {
     Ok(vm.ctx.none())
 }
 
-fn object_and(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
-    arg_check!(vm, args, required = [(zelf, None), (other, None)]);
-
-    let zelf_type = objtype::get_type_name(&zelf.typ());
-    let other_type = objtype::get_type_name(&other.typ());
-    Err(vm.new_type_error(format!(
-        "unsupported operand type(s) for &: {:?} and {:?}",
-        zelf_type, other_type
-    )))
-}
-
 fn object_dict(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
     match args.args[0].borrow().kind {
         PyObjectKind::Class { ref dict, .. } => Ok(dict.clone()),
diff --git a/vm/src/vm.rs b/vm/src/vm.rs
@@ -407,7 +407,50 @@ impl VirtualMachine {
     }
 
     pub fn _and(&mut self, a: PyObjectRef, b: PyObjectRef) -> PyResult {
-        self.call_method(&a, "__and__", vec![b])
+        // 1. Try __and__, next __rand__, next, give up
+        if let Ok(method) = self.get_method(a.clone(), "__and__") {
+            match self.invoke(
+                method,
+                PyFuncArgs {
+                    args: vec![b.clone()],
+                    kwargs: vec![],
+                },
+            ) {
+                Ok(value) => return Ok(value),
+                Err(err) => {
+                    if !objtype::isinstance(&err, &self.ctx.exceptions.not_implemented_error) {
+                        return Err(err);
+                    }
+                }
+            }
+        }
+
+        // 2. try __rand__
+        if let Ok(method) = self.get_method(b.clone(), "__rand__") {
+            match self.invoke(
+                method,
+                PyFuncArgs {
+                    args: vec![a.clone()],
+                    kwargs: vec![],
+                },
+            ) {
+                Ok(value) => return Ok(value),
+                Err(err) => {
+                    if !objtype::isinstance(&err, &self.ctx.exceptions.not_implemented_error) {
+                        return Err(err);
+                    }
+                }
+            }
+        }
+
+        // 3. It all failed :(
+        // Cannot and a and b
+        let a_type_name = objtype::get_type_name(&a.typ());
+        let b_type_name = objtype::get_type_name(&b.typ());
+        Err(self.new_type_error(format!(
+            "Unsupported operand types for '&': '{}' and '{}'",
+            a_type_name, b_type_name
+        )))
     }
 }
 
