Commit2aa7638

committed

Try __sub__, next __rsub__, next give up

1 parentbddaf3e commit2aa7638Copy full SHA for 2aa7638

File tree

+18

-2

lines changed

+18

-2

lines changed

Lines changed: 18 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,10 @@ use super::obj::objlist;`
`17`	`17`	`usesuper::obj::objobject;`
`18`	`18`	`usesuper::obj::objtuple;`
`19`	`19`	`usesuper::obj::objtype;`
`20`		`-usesuper::pyobject::{DictProtocol,PyContext,PyFuncArgs,PyObjectKind,PyObjectRef,PyResult};`
	`20`	`+usesuper::pyobject::{`
	`21`	`+AttributeProtocol,DictProtocol,PyContext,PyFuncArgs,PyObjectKind,PyObjectRef,PyResult,`
	`22`	`+TypeProtocol,`
	`23`	`+};`
`21`	`24`	`usesuper::stdlib;`
`22`	`25`	`usesuper::sysmodule;`
`23`	`26`
`@@ -375,7 +378,20 @@ impl VirtualMachine {`
`375`	`378`	`}`
`376`	`379`
`377`	`380`	`pubfn_sub(&mutself,a:PyObjectRef,b:PyObjectRef) ->PyResult{`
`378`		`-self.call_method(&a,"__sub__",vec![b])`
	`381`	`+// Try __sub__, next __rsub__, next, give up`
	`382`	`+if a.has_attr("__sub__"){`
	`383`	`+self.call_method(&a,"__sub__",vec![b])`
	`384`	`+}elseif b.has_attr("__rsub__"){`
	`385`	`+self.call_method(&b,"__rsub__",vec![a])`
	`386`	`+}else{`
	`387`	`+// Cannot sub a and b`
	`388`	`+let a_type_name = objtype::get_type_name(&a.typ());`
	`389`	`+let b_type_name = objtype::get_type_name(&b.typ());`
	`390`	`+Err(self.new_type_error(format!(`
	`391`	`+"Unsupported operand types for '-': '{}' and '{}'",`
	`392`	`+ a_type_name, b_type_name`
	`393`	`+)))`
	`394`	`+}`
`379`	`395`	`}`
`380`	`396`
`381`	`397`	`pubfn_add(&mutself,a:PyObjectRef,b:PyObjectRef) ->PyResult{`

Comments

(0)