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

Fix argument keyword error in bool.__new__

Browse Source 
Add BoolArgs struct to fix argument keyword error in bool.__new
This commit is contained in:
lntuition
2019-10-02 15:03:04 +09:00
parent 02135be992
commit a07daf322f
1 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
vm/src/obj/objbool.rs
View File

@@ -1,7 +1,7 @@
use num_bigint::Sign;
use num_traits::Zero;
use crate::function::PyFuncArgs;
use crate::function::{OptionalArg, PyFuncArgs};
use crate::pyobject::{
IntoPyObject, PyContext, PyObjectRef, PyResult, TryFromObject, TypeProtocol,
};
@@ -188,19 +188,16 @@ fn bool_rxor(lhs: PyObjectRef, rhs: PyObjectRef, vm: &VirtualMachine) -> PyResul
do_bool_xor(vm, &lhs, &rhs)
}
fn bool_new(vm: &VirtualMachine, args: PyFuncArgs) -> PyResult {
arg_check!(
vm,
args,
required = [(_zelf, Some(vm.ctx.type_type()))],
optional = [(val, None)]
);
Ok(match val {
Some(val) => {
let bv = boolval(vm, val.clone())?;
vm.new_bool(bv)
}
None => vm.context().new_bool(false),
#[derive(FromArgs)]
struct BoolArgs {
#[pyarg(positional_or_keyword, optional = true)]
x: OptionalArg<PyObjectRef>,
}
fn bool_new(_cls: objtype::PyClassRef, args: BoolArgs, vm: &VirtualMachine) -> PyResult {
Ok(match args.x {
OptionalArg::Present(x) => vm.new_bool(boolval(vm, x.clone())?),
OptionalArg::Missing => vm.context().new_bool(false),
})
}