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

float.{__lt__, __le__, __ge__, __gt__} fix comparing with non float type

Browse Source
This commit is contained in:
janczer
2019-02-09 17:03:06 +01:00
parent 3c25c14311
commit 8d1d6ce1ee
2 changed files with 61 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
tests/snippets/floats.py
View File

@@ -18,3 +18,24 @@ assert not a >= b
assert a + b == 2.5
assert a - c == 0
assert a / c == 1
assert a < 5
assert a <= 5
try:
assert a < 'a'
except TypeError:
pass
try:
assert a <= 'a'
except TypeError:
pass
assert a > 1
assert a >= 1
try:
assert a > 'a'
except TypeError:
pass
try:
assert a >= 'a'
except TypeError:
pass

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

@@ -83,60 +83,68 @@ fn float_lt(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
arg_check!(
vm,
args,
required = [
(zelf, Some(vm.ctx.float_type())),
(other, Some(vm.ctx.float_type()))
]
required = [(i, Some(vm.ctx.float_type())), (i2, None)]
);
let zelf = get_value(zelf);
let other = get_value(other);
let result = zelf < other;
Ok(vm.ctx.new_bool(result))
let v1 = get_value(i);
if objtype::isinstance(i2, &vm.ctx.float_type()) {
Ok(vm.ctx.new_bool(v1 < get_value(i2)))
} else if objtype::isinstance(i2, &vm.ctx.int_type()) {
Ok(vm.ctx.new_bool(v1 < objint::get_value(i2).to_f64().unwrap()))
} else {
Err(vm.new_type_error(format!("Cannot compare {} and {}", i.borrow(), i2.borrow())))
}
}
fn float_le(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
arg_check!(
vm,
args,
required = [
(zelf, Some(vm.ctx.float_type())),
(other, Some(vm.ctx.float_type()))
]
required = [(i, Some(vm.ctx.float_type())), (i2, None)]
);
let zelf = get_value(zelf);
let other = get_value(other);
let result = zelf <= other;
Ok(vm.ctx.new_bool(result))
let v1 = get_value(i);
if objtype::isinstance(i2, &vm.ctx.float_type()) {
Ok(vm.ctx.new_bool(v1 <= get_value(i2)))
} else if objtype::isinstance(i2, &vm.ctx.int_type()) {
Ok(vm.ctx.new_bool(v1 <= objint::get_value(i2).to_f64().unwrap()))
} else {
Err(vm.new_type_error(format!("Cannot compare {} and {}", i.borrow(), i2.borrow())))
}
}
fn float_gt(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
arg_check!(
vm,
args,
required = [
(zelf, Some(vm.ctx.float_type())),
(other, Some(vm.ctx.float_type()))
]
required = [(i, Some(vm.ctx.float_type())), (i2, None)]
);
let zelf = get_value(zelf);
let other = get_value(other);
let result = zelf > other;
Ok(vm.ctx.new_bool(result))
let v1 = get_value(i);
if objtype::isinstance(i2, &vm.ctx.float_type()) {
Ok(vm.ctx.new_bool(v1 > get_value(i2)))
} else if objtype::isinstance(i2, &vm.ctx.int_type()) {
Ok(vm.ctx.new_bool(v1 > objint::get_value(i2).to_f64().unwrap()))
} else {
Err(vm.new_type_error(format!("Cannot compare {} and {}", i.borrow(), i2.borrow())))
}
}
fn float_ge(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
arg_check!(
vm,
args,
required = [
(zelf, Some(vm.ctx.float_type())),
(other, Some(vm.ctx.float_type()))
]
required = [(i, Some(vm.ctx.float_type())), (i2, None)]
);
let zelf = get_value(zelf);
let other = get_value(other);
let result = zelf >= other;
Ok(vm.ctx.new_bool(result))
let v1 = get_value(i);
if objtype::isinstance(i2, &vm.ctx.float_type()) {
Ok(vm.ctx.new_bool(v1 >= get_value(i2)))
} else if objtype::isinstance(i2, &vm.ctx.int_type()) {
Ok(vm.ctx.new_bool(v1 >= objint::get_value(i2).to_f64().unwrap()))
} else {
Err(vm.new_type_error(format!("Cannot compare {} and {}", i.borrow(), i2.borrow())))
}
}
fn float_abs(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {