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

implement PyIter_Check on PyIter

Browse Source 
Signed-off-by: snowapril <sinjihng@gmail.com>
This commit is contained in:
snowapril
2021-10-01 12:24:44 +09:00
parent 30fd99f1be
commit 4a29231b3a
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
vm/src/protocol/iter.rs
View File

@@ -18,6 +18,11 @@ impl PyIter<PyObjectRef> {
pub fn into_object(self) -> PyObjectRef {
self.0
}
pub fn check(obj: &PyObjectRef) -> bool {
obj.class()
.mro_find_map(|x| x.slots.iternext.load())
.is_some()
}
}
impl<T> PyIter<T>
@@ -83,18 +88,16 @@ impl TryFromObject for PyIter<PyObjectRef> {
};
if let Some(getiter) = getiter {
let iter = getiter(iter_target, vm)?;
let cls = iter.class();
let is_iter = cls.iter_mro().any(|x| x.slots.iternext.load().is_some());
if is_iter {
drop(cls);
if PyIter::check(&iter) {
Ok(Self(iter))
} else {
Err(vm.new_type_error(format!(
"iter() returned non-iterator of type '{}'",
cls.name()
iter.class().name()
)))
}
} else {
// TODO: __getitem__ method lookup must be replaced by sequence protocol checking
vm.get_method_or_type_error(iter_target.clone(), "__getitem__", || {
format!("'{}' object is not iterable", iter_target.class().name())
})?;