Merge pull request RustPython#1626 from youknowone/refactor-get_float_value

Refacter objint

Author: coolreader18

vm/src/obj/objbool.rs

@@ -7,7 +7,7 @@ use crate::pyobject::{
 };
 use crate::vm::VirtualMachine;
 
-use super::objint::PyInt;
+use super::objint::{self, PyInt};
 use super::objstr::PyStringRef;
 use super::objtype;
 
@@ -111,7 +111,7 @@ pub fn not(vm: &VirtualMachine, obj: &PyObjectRef) -> PyResult<bool> {
 
 // Retrieve inner int value:
 pub fn get_value(obj: &PyObjectRef) -> bool {
-    !obj.payload::<PyInt>().unwrap().as_bigint().is_zero()
+    !objint::get_py_int(obj).as_bigint().is_zero()
 }
 
 fn bool_repr(obj: bool, _vm: &VirtualMachine) -> String {
@@ -142,7 +142,7 @@ fn bool_or(lhs: PyObjectRef, rhs: PyObjectRef, vm: &VirtualMachine) -> PyResult
         let rhs = get_value(&rhs);
         (lhs || rhs).into_pyobject(vm)
     } else {
-        Ok(lhs.payload::<PyInt>().unwrap().or(rhs.clone(), vm))
+        Ok(objint::get_py_int(&lhs).or(rhs.clone(), vm))
     }
 }
 
@@ -154,7 +154,7 @@ fn bool_and(lhs: PyObjectRef, rhs: PyObjectRef, vm: &VirtualMachine) -> PyResult
         let rhs = get_value(&rhs);
         (lhs && rhs).into_pyobject(vm)
     } else {
-        Ok(lhs.payload::<PyInt>().unwrap().and(rhs.clone(), vm))
+        Ok(objint::get_py_int(&lhs).and(rhs.clone(), vm))
     }
 }
 
@@ -166,7 +166,7 @@ fn bool_xor(lhs: PyObjectRef, rhs: PyObjectRef, vm: &VirtualMachine) -> PyResult
         let rhs = get_value(&rhs);
         (lhs ^ rhs).into_pyobject(vm)
     } else {
-        Ok(lhs.payload::<PyInt>().unwrap().xor(rhs.clone(), vm))
+        Ok(objint::get_py_int(&lhs).xor(rhs.clone(), vm))
     }
 }
 

vm/src/obj/objfloat.rs

@@ -55,7 +55,7 @@ pub fn try_float(value: &PyObjectRef, vm: &VirtualMachine) -> PyResult<Option<f6
     Ok(if objtype::isinstance(&value, &vm.ctx.float_type()) {
         Some(get_value(&value))
     } else if objtype::isinstance(&value, &vm.ctx.int_type()) {
-        Some(objint::get_float_value(&value, vm)?)
+        Some(from_int_value(&value, vm)?)
     } else {
         None
     })
@@ -678,11 +678,15 @@ fn invalid_convert(vm: &VirtualMachine, literal: &str) -> PyObjectRef {
     vm.new_value_error(format!("could not convert string to float: '{}'", literal))
 }
 
+pub fn from_int_value(obj: &PyObjectRef, vm: &VirtualMachine) -> PyResult<f64> {
+    objint::try_float(objint::get_py_int(obj).as_bigint(), vm)
+}
+
 fn to_float(vm: &VirtualMachine, obj: &PyObjectRef) -> PyResult<f64> {
     let value = if objtype::isinstance(&obj, &vm.ctx.float_type()) {
         get_value(&obj)
     } else if objtype::isinstance(&obj, &vm.ctx.int_type()) {
-        objint::get_float_value(&obj, vm)?
+        from_int_value(&obj, vm)?
     } else if objtype::isinstance(&obj, &vm.ctx.str_type()) {
         str_to_float(vm, objstr::get_value(&obj).trim())?
     } else if objtype::isinstance(&obj, &vm.ctx.bytes_type()) {