Change int __pow__ to use bigint pow.

windelbouwman · windelbouwman · commit a6f64eefee03 · 2018-11-03T10:30:17.000+01:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/tests/snippets/builtin_bin.py b/tests/snippets/builtin_bin.py
@@ -6,8 +6,7 @@
 assert bin(-(2**24)) == '-0b1' + '0' * 24
 assert bin(-(2**24-1)) == '-0b' + '1' * 24
 
-# TODO: change to 2**65 when we have support for pow in bigint
-a = 2**20 * 2**20 * 2**25
+a = 2 ** 65
 assert bin(a) == '0b1' + '0' * 65
 assert bin(a-1) == '0b' + '1' * 65
 assert bin(-(a)) == '-0b1' + '0' * 65
diff --git a/tests/snippets/whats_left_to_implement.py b/tests/snippets/whats_left_to_implement.py
@@ -873,12 +873,11 @@
         not_implemented.append(("bytes", method))
 
 for method in complex_expected_methods:
-# TODO: uncomment this when complex is implemented
-#    try:
-#        if not hasattr(complex, method):
-#            not_implemented.append(("complex", method))
-#    except NameError:
-    not_implemented.append(("complex", method))
+    try:
+        if not hasattr(complex, method):
+            not_implemented.append(("complex", method))
+    except NameError:
+        not_implemented.append(("complex", method))
 
 for method in dict_expected_methods:
     try:
diff --git a/vm/Cargo.toml b/vm/Cargo.toml
@@ -6,7 +6,7 @@ authors = ["Shing Lyu <shing.lyu@gmail.com>"]
 [dependencies]
 bitflags = "1.0.4"
 num-complex = "0.2"
-num-bigint = "0.2"
+num-bigint = "0.2.1"
 num-traits = "0.2"
 log = "0.3"
 rustpython_parser = {path = "../parser"}
diff --git a/vm/src/obj/objcomplex.rs b/vm/src/obj/objcomplex.rs
@@ -12,6 +12,7 @@ pub fn init(context: &PyContext) {
     complex_type.set_attr("__add__", context.new_rustfunc(complex_add));
     complex_type.set_attr("__new__", context.new_rustfunc(complex_new));
     complex_type.set_attr("__repr__", context.new_rustfunc(complex_repr));
+    complex_type.set_attr("conjugate", context.new_rustfunc(complex_conjugate));
 }
 
 pub fn get_value(obj: &PyObjectRef) -> Complex64 {
@@ -64,6 +65,13 @@ fn complex_add(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
     }
 }
 
+fn complex_conjugate(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
+    arg_check!(vm, args, required = [(i, Some(vm.ctx.complex_type()))]);
+
+    let v1 = get_value(i);
+    Ok(vm.ctx.new_complex(v1.conj()))
+}
+
 fn complex_repr(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
     arg_check!(vm, args, required = [(obj, Some(vm.ctx.complex_type()))]);
     let v = get_value(obj);
diff --git a/vm/src/obj/objint.rs b/vm/src/obj/objint.rs
@@ -7,7 +7,7 @@ use super::objfloat;
 use super::objstr;
 use super::objtype;
 use num_bigint::{BigInt, ToBigInt};
-use num_traits::{Signed, ToPrimitive, Zero};
+use num_traits::{Pow, Signed, ToPrimitive, Zero};
 
 // This proxy allows for easy switching between types.
 // TODO: maybe this is a good idea:
@@ -296,10 +296,7 @@ fn int_pow(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
     let v1 = get_value(i);
     if objtype::isinstance(i2, &vm.ctx.int_type()) {
         let v2 = get_value(i2).to_u32().unwrap();
-        // TODO: look for bigint pow method
-        Ok(vm
-            .ctx
-            .new_int(v1.to_i32().unwrap().pow(v2).to_bigint().unwrap()))
+        Ok(vm.ctx.new_int(v1.pow(v2).to_bigint().unwrap()))
     } else if objtype::isinstance(i2, &vm.ctx.float_type()) {
         let v2 = objfloat::get_value(i2);
         Ok(vm.ctx.new_float((v1.to_f64().unwrap()).powf(v2)))

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@ pub fn init(context: &PyContext) {`
`12`	`12`	`complex_type.set_attr("__add__", context.new_rustfunc(complex_add));`
`13`	`13`	`complex_type.set_attr("__new__", context.new_rustfunc(complex_new));`
`14`	`14`	`complex_type.set_attr("__repr__", context.new_rustfunc(complex_repr));`
	`15`	`+ complex_type.set_attr("conjugate", context.new_rustfunc(complex_conjugate));`
`15`	`16`	`}`
`16`	`17`
`17`	`18`	`pub fn get_value(obj: &PyObjectRef) -> Complex64 {`
`@@ -64,6 +65,13 @@ fn complex_add(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {`
`64`	`65`	`}`
`65`	`66`	`}`
`66`	`67`
	`68`	`+fn complex_conjugate(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {`
	`69`	`+ arg_check!(vm, args, required = [(i, Some(vm.ctx.complex_type()))]);`
	`70`	`+`
	`71`	`+ let v1 = get_value(i);`
	`72`	`+ Ok(vm.ctx.new_complex(v1.conj()))`
	`73`	`+}`
	`74`	`+`
`67`	`75`	`fn complex_repr(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {`
`68`	`76`	`arg_check!(vm, args, required = [(obj, Some(vm.ctx.complex_type()))]);`
`69`	`77`	`let v = get_value(obj);`