Rust-related/RustPython
1
0
Fork 1
mirror of https://github.com/RustPython/RustPython.git synced 2026-06-02 19:39:49 +09:00
Code Issues Packages Projects Releases Wiki Activity

Fix floor and ceil functions to match cpython behavior

Browse Source
This commit is contained in:
Zach Silver
2021-02-15 16:30:14 -08:00
parent 820337e6c3
commit 9636996c4f
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -295,13 +295,14 @@ fn math_trunc(value: PyObjectRef, vm: &VirtualMachine) -> PyResult {
/// * `value` - Either a float or a python object which implements __ceil__
/// * `vm` - Represents the python state.
fn math_ceil(value: PyObjectRef, vm: &VirtualMachine) -> PyResult {
if value.isinstance(&vm.ctx.types.float_type) {
let v = float::get_value(&value);
let v = float::try_bigint(v.ceil(), vm)?;
Ok(vm.ctx.new_int(v))
} else {
try_magic_method("__ceil__", vm, &value)
let result_or_err = try_magic_method("__ceil__", vm, &value);
if result_or_err.is_err() {
if let Ok(Some(v)) = float::try_float_opt(&value, &vm) {
let v = float::try_bigint(v.ceil(), vm)?;
return Ok(vm.ctx.new_int(v));
}
}
result_or_err
}
/// Applies floor to a float, returning an Integral.
@@ -311,13 +312,14 @@ fn math_ceil(value: PyObjectRef, vm: &VirtualMachine) -> PyResult {
/// * `value` - Either a float or a python object which implements __ceil__
/// * `vm` - Represents the python state.
fn math_floor(value: PyObjectRef, vm: &VirtualMachine) -> PyResult {
if value.isinstance(&vm.ctx.types.float_type) {
let v = float::get_value(&value);
let v = float::try_bigint(v.floor(), vm)?;
Ok(vm.ctx.new_int(v))
} else {
try_magic_method("__floor__", vm, &value)
let result_or_err = try_magic_method("__floor__", vm, &value);
if result_or_err.is_err() {
if let Ok(Some(v)) = float::try_float_opt(&value, &vm) {
let v = float::try_bigint(v.floor(), vm)?;
return Ok(vm.ctx.new_int(v));
}
}
result_or_err
}
fn math_frexp(value: IntoPyFloat) -> (f64, i32) {