Commite7cd832

committed

Changed to proper implementation in vm

1 parent0e4d367 commite7cd832Copy full SHA for e7cd832

File tree

+44

-13

lines changed

+44

-13

lines changed

Lines changed: 0 additions & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -101,24 +101,12 @@ pub fn init(context: &PyContext) {`
`101`	`101`	`object.set_attr("__hash__", context.new_rustfunc(object_hash));`
`102`	`102`	`object.set_attr("__str__", context.new_rustfunc(object_str));`
`103`	`103`	`object.set_attr("__repr__", context.new_rustfunc(object_repr));`
`104`		`- object.set_attr("__and__", context.new_rustfunc(object_and));`
`105`	`104`	`}`
`106`	`105`
`107`	`106`	`fnobject_init(vm:&mutVirtualMachine,_args:PyFuncArgs) ->PyResult{`
`108`	`107`	`Ok(vm.ctx.none())`
`109`	`108`	`}`
`110`	`109`
`111`		`-fnobject_and(vm:&mutVirtualMachine,args:PyFuncArgs) ->PyResult{`
`112`		`-arg_check!(vm, args, required =[(zelf,None),(other,None)]);`
`113`		`-`
`114`		`-let zelf_type = objtype::get_type_name(&zelf.typ());`
`115`		`-let other_type = objtype::get_type_name(&other.typ());`
`116`		`-Err(vm.new_type_error(format!(`
`117`		`-"unsupported operand type(s) for &: {:?} and {:?}",`
`118`		`- zelf_type, other_type`
`119`		`-)))`
`120`		`-}`
`121`		`-`
`122`	`110`	`fnobject_dict(vm:&mutVirtualMachine,args:PyFuncArgs) ->PyResult{`
`123`	`111`	`match args.args[0].borrow().kind{`
`124`	`112`	`PyObjectKind::Class{ref dict, ..} =>Ok(dict.clone()),`

Lines changed: 44 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -407,7 +407,50 @@ impl VirtualMachine {`
`407`	`407`	`}`
`408`	`408`
`409`	`409`	`pubfn_and(&mutself,a:PyObjectRef,b:PyObjectRef) ->PyResult{`
`410`		`-self.call_method(&a,"__and__",vec![b])`
	`410`	`+// 1. Try __and__, next __rand__, next, give up`
	`411`	`+ifletOk(method) =self.get_method(a.clone(),"__and__"){`
	`412`	`+matchself.invoke(`
	`413`	`+ method,`
	`414`	`+PyFuncArgs{`
	`415`	`+args:vec![b.clone()],`
	`416`	`+kwargs:vec![],`
	`417`	`+},`
	`418`	`+){`
	`419`	`+Ok(value) =>returnOk(value),`
	`420`	`+Err(err) =>{`
	`421`	`+if !objtype::isinstance(&err,&self.ctx.exceptions.not_implemented_error){`
	`422`	`+returnErr(err);`
	`423`	`+}`
	`424`	`+}`
	`425`	`+}`
	`426`	`+}`
	`427`	`+`
	`428`	`+// 2. try __rand__`
	`429`	`+ifletOk(method) =self.get_method(b.clone(),"__rand__"){`
	`430`	`+matchself.invoke(`
	`431`	`+ method,`
	`432`	`+PyFuncArgs{`
	`433`	`+args:vec![a.clone()],`
	`434`	`+kwargs:vec![],`
	`435`	`+},`
	`436`	`+){`
	`437`	`+Ok(value) =>returnOk(value),`
	`438`	`+Err(err) =>{`
	`439`	`+if !objtype::isinstance(&err,&self.ctx.exceptions.not_implemented_error){`
	`440`	`+returnErr(err);`
	`441`	`+}`
	`442`	`+}`
	`443`	`+}`
	`444`	`+}`
	`445`	`+`
	`446`	`+// 3. It all failed :(`
	`447`	`+// Cannot and a and b`
	`448`	`+let a_type_name = objtype::get_type_name(&a.typ());`
	`449`	`+let b_type_name = objtype::get_type_name(&b.typ());`
	`450`	`+Err(self.new_type_error(format!(`
	`451`	`+"Unsupported operand types for '&': '{}' and '{}'",`
	`452`	`+ a_type_name, b_type_name`
	`453`	`+)))`
`411`	`454`	`}`
`412`	`455`	`}`
`413`	`456`

Comments

(0)