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

Merge pull request #611 from RustPython/pyargs

Browse Source 
Less explicit PyFuncArgs is better.
This commit is contained in:
Windel Bouwman
2019-03-06 17:10:13 +01:00
committed by GitHub
parent 03b419917e 6d84b4d4e9
commit 507a5b698f
6 changed files with 39 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
vm/src/obj/objfilter.rs
View File

@@ -36,13 +36,7 @@ fn filter_next(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
} else {
// the predicate itself can raise StopIteration which does stop the filter
// iteration
vm.invoke(
predicate.clone(),
PyFuncArgs {
args: vec![next_obj.clone()],
kwargs: vec![],
},
)?
vm.invoke(predicate.clone(), vec![next_obj.clone()])?
};
if objbool::boolval(vm, predicate_value)? {
return Ok(next_obj);

24
vm/src/obj/objtype.rs
View File

@@ -210,13 +210,7 @@ pub fn type_getattribute(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult
let attr_class = attr.typ();
if attr_class.has_attr("__set__") {
if let Some(descriptor) = attr_class.get_attr("__get__") {
return vm.invoke(
descriptor,
PyFuncArgs {
args: vec![attr, cls.clone(), mcl],
kwargs: vec![],
},
);
return vm.invoke(descriptor, vec![attr, cls.clone(), mcl]);
}
}
}
@@ -225,13 +219,7 @@ pub fn type_getattribute(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult
let attr_class = attr.typ();
if let Some(descriptor) = attr_class.get_attr("__get__") {
let none = vm.get_none();
return vm.invoke(
descriptor,
PyFuncArgs {
args: vec![attr, none, cls.clone()],
kwargs: vec![],
},
);
return vm.invoke(descriptor, vec![attr, none, cls.clone()]);
}
}
@@ -240,13 +228,7 @@ pub fn type_getattribute(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult
} else if let Some(attr) = mcl.get_attr(&name) {
vm.call_get_descriptor(attr, cls.clone())
} else if let Some(getter) = cls.get_attr("__getattr__") {
vm.invoke(
getter,
PyFuncArgs {
args: vec![mcl, name_str.clone()],
kwargs: vec![],
},
)
vm.invoke(getter, vec![mcl, name_str.clone()])
} else {
let attribute_error = vm.context().exceptions.attribute_error.clone();
Err(vm.new_exception(