mschoi/RustPython
1
0
Fork 0
forked from Rust-related/RustPython
Code Pull Requests Actions Activity

Changed to use existing method

Browse Source 
Made try_to_bigint public and then used for math.ceil and math.floor
This commit is contained in:
Adolfo Gonzalez III
2019-11-07 12:07:02 -06:00
parent 6d73dac56d
commit 256f3562c2
2 changed files with 5 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
vm/src/obj/objfloat.rs
View File

@@ -89,7 +89,7 @@ fn inner_mod(v1: f64, v2: f64, vm: &VirtualMachine) -> PyResult<f64> {
}
}
fn try_to_bigint(value: f64, vm: &VirtualMachine) -> PyResult<BigInt> {
pub fn try_to_bigint(value: f64, vm: &VirtualMachine) -> PyResult<BigInt> {
match value.to_bigint() {
Some(int) => Ok(int),
None => {

20
vm/src/stdlib/math.rs
View File

@@ -220,17 +220,11 @@ fn math_trunc(value: PyObjectRef, vm: &VirtualMachine) -> PyResult {
///
/// * `value` - Either a float or a python object which implements __ceil__
/// * `vm` - Represents the python state.
///
/// # Remarks
///
/// Currently the code is applying ceil to the float using rust's builtin
/// method and then converts to integral using python float's __int__ method.
///
fn math_ceil(value: PyObjectRef, vm: &VirtualMachine) -> PyResult {
if objtype::isinstance(&value, &vm.ctx.float_type()) {
let v = objfloat::get_value(&value);
let v = vm.ctx.new_float(v.ceil());
try_magic_method("__int__", vm, &v)
let v = objfloat::try_to_bigint(v.ceil(), vm)?;
Ok(vm.ctx.new_int(v))
} else {
try_magic_method("__ceil__", vm, &value)
}
@@ -242,17 +236,11 @@ fn math_ceil(value: PyObjectRef, vm: &VirtualMachine) -> PyResult {
///
/// * `value` - Either a float or a python object which implements __ceil__
/// * `vm` - Represents the python state.
///
/// # Remarks
///
/// Currently the code is applying floor to the float using rust's builtin
/// method and then converts to integral using python float's __int__ method.
///
fn math_floor(value: PyObjectRef, vm: &VirtualMachine) -> PyResult {
if objtype::isinstance(&value, &vm.ctx.float_type()) {
let v = objfloat::get_value(&value);
let v = vm.ctx.new_float(v.floor());
try_magic_method("__int__", vm, &v)
let v = objfloat::try_to_bigint(v.floor(), vm)?;
Ok(vm.ctx.new_int(v))
} else {
try_magic_method("__floor__", vm, &value)
}