Use call_or_unsupported for operators.

chaconnewu · chaconnewu · commit 561eb8ed4fed · 2019-02-02T21:47:28.000-08:00
diff --git a/.gitignore b/.gitignore
@@ -5,4 +5,5 @@ __pycache__
 **/*.pytest_cache
 .*sw*
 .repl_history.txt
+.vscode
 wasm-pack.log
diff --git a/vm/src/vm.rs b/vm/src/vm.rs
@@ -549,27 +549,27 @@ impl VirtualMachine {
     }
 
     pub fn _add(&mut self, a: PyObjectRef, b: PyObjectRef) -> PyResult {
-        self.call_method(&a, "__add__", vec![b])
+        self.call_or_unsupported(a, b, "__add__", "__radd__", "+")
     }
 
     pub fn _mul(&mut self, a: PyObjectRef, b: PyObjectRef) -> PyResult {
-        self.call_method(&a, "__mul__", vec![b])
+        self.call_or_unsupported(a, b, "__mul__", "__rmul__", "*")
     }
 
     pub fn _div(&mut self, a: PyObjectRef, b: PyObjectRef) -> PyResult {
-        self.call_method(&a, "__truediv__", vec![b])
+        self.call_or_unsupported(a, b, "__truediv__", "__truediv__", "/")
     }
 
     pub fn _pow(&mut self, a: PyObjectRef, b: PyObjectRef) -> PyResult {
-        self.call_method(&a, "__pow__", vec![b])
+        self.call_or_unsupported(a, b, "__pow__", "__rpow__", "**")
     }
 
     pub fn _modulo(&mut self, a: PyObjectRef, b: PyObjectRef) -> PyResult {
-        self.call_method(&a, "__mod__", vec![b])
+        self.call_or_unsupported(a, b, "__mod__", "__rmod__", "%")
     }
 
     pub fn _xor(&mut self, a: PyObjectRef, b: PyObjectRef) -> PyResult {
-        self.call_method(&a, "__xor__", vec![b])
+        self.call_or_unsupported(a, b, "__xor__", "__rxor__", "^")
     }
 
     pub fn _or(&mut self, a: PyObjectRef, b: PyObjectRef) -> PyResult {

Original file line number	Diff line number	Diff line change
`@@ -549,27 +549,27 @@ impl VirtualMachine {`
`549`	`549`	`}`
`550`	`550`
`551`	`551`	`pub fn _add(&mut self, a: PyObjectRef, b: PyObjectRef) -> PyResult {`
`552`		`- self.call_method(&a, "__add__", vec![b])`
	`552`	`+ self.call_or_unsupported(a, b, "__add__", "__radd__", "+")`
`553`	`553`	`}`
`554`	`554`
`555`	`555`	`pub fn _mul(&mut self, a: PyObjectRef, b: PyObjectRef) -> PyResult {`
`556`		`- self.call_method(&a, "__mul__", vec![b])`
	`556`	`+ self.call_or_unsupported(a, b, "__mul__", "__rmul__", "*")`
`557`	`557`	`}`
`558`	`558`
`559`	`559`	`pub fn _div(&mut self, a: PyObjectRef, b: PyObjectRef) -> PyResult {`
`560`		`- self.call_method(&a, "__truediv__", vec![b])`
	`560`	`+ self.call_or_unsupported(a, b, "__truediv__", "__truediv__", "/")`
`561`	`561`	`}`
`562`	`562`
`563`	`563`	`pub fn _pow(&mut self, a: PyObjectRef, b: PyObjectRef) -> PyResult {`
`564`		`- self.call_method(&a, "__pow__", vec![b])`
	`564`	`+ self.call_or_unsupported(a, b, "__pow__", "__rpow__", "**")`
`565`	`565`	`}`
`566`	`566`
`567`	`567`	`pub fn _modulo(&mut self, a: PyObjectRef, b: PyObjectRef) -> PyResult {`
`568`		`- self.call_method(&a, "__mod__", vec![b])`
	`568`	`+ self.call_or_unsupported(a, b, "__mod__", "__rmod__", "%")`
`569`	`569`	`}`
`570`	`570`
`571`	`571`	`pub fn _xor(&mut self, a: PyObjectRef, b: PyObjectRef) -> PyResult {`
`572`		`- self.call_method(&a, "__xor__", vec![b])`
	`572`	`+ self.call_or_unsupported(a, b, "__xor__", "__rxor__", "^")`
`573`	`573`	`}`
`574`	`574`
`575`	`575`	`pub fn _or(&mut self, a: PyObjectRef, b: PyObjectRef) -> PyResult {`