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

introduce PyIterReturn::from_getitem_result

Browse Source
This commit is contained in:
Kangzhi Shi
2021-10-01 21:16:43 +02:00
parent 350c4de4e5
commit e1f689c565
3 changed files with 16 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
vm/src/builtins/enumerate.rs
View File

@@ -1,6 +1,5 @@
use super::{IterStatus, PositionIterInternal, PyIntRef, PyTypeRef};
use crate::common::lock::{PyMutex, PyRwLock};
use crate::TypeProtocol;
use crate::{
function::OptionalArg,
protocol::{PyIter, PyIterReturn},
@@ -115,17 +114,7 @@ impl SlotIterator for PyReverseSequenceIterator {
fn next(zelf: &PyRef<Self>, vm: &VirtualMachine) -> PyResult<PyIterReturn> {
zelf.internal
.lock()
.rev_next(|obj, pos| match obj.get_item(pos, vm) {
Ok(ret) => Ok(PyIterReturn::Return(ret)),
Err(e) if e.isinstance(&vm.ctx.exceptions.index_error) => {
Ok(PyIterReturn::StopIteration(None))
}
Err(e) if e.isinstance(&vm.ctx.exceptions.stop_iteration) => {
let args = e.get_arg(0);
Ok(PyIterReturn::StopIteration(args))
}
Err(e) => Err(e),
})
.rev_next(|obj, pos| PyIterReturn::from_getitem_result(obj.get_item(pos, vm), vm))
}
}

15
vm/src/builtins/iter.rs
View File

@@ -7,8 +7,7 @@ use crate::{
function::ArgCallable,
protocol::PyIterReturn,
slots::{IteratorIterable, SlotIterator},
ItemProtocol, PyClassImpl, PyContext, PyObjectRef, PyRef, PyResult, PyValue, TypeProtocol,
VirtualMachine,
ItemProtocol, PyClassImpl, PyContext, PyObjectRef, PyRef, PyResult, PyValue, VirtualMachine,
};
use rustpython_common::{
lock::{PyMutex, PyRwLock, PyRwLockUpgradableReadGuard},
@@ -211,17 +210,7 @@ impl SlotIterator for PySequenceIterator {
fn next(zelf: &PyRef<Self>, vm: &VirtualMachine) -> PyResult<PyIterReturn> {
zelf.internal
.lock()
.next(|obj, pos| match obj.get_item(pos, vm) {
Ok(ret) => Ok(PyIterReturn::Return(ret)),
Err(e) if e.isinstance(&vm.ctx.exceptions.index_error) => {
Ok(PyIterReturn::StopIteration(None))
}
Err(e) if e.isinstance(&vm.ctx.exceptions.stop_iteration) => {
let args = e.get_arg(0);
Ok(PyIterReturn::StopIteration(args))
}
Err(e) => Err(e),
})
.next(|obj, pos| PyIterReturn::from_getitem_result(obj.get_item(pos, vm), vm))
}
}

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

@@ -136,6 +136,19 @@ impl PyIterReturn {
Err(err) => Err(err),
}
}
pub fn from_getitem_result(result: PyResult, vm: &VirtualMachine) -> PyResult<Self> {
match result {
Ok(obj) => Ok(Self::Return(obj)),
Err(err) if err.isinstance(&vm.ctx.exceptions.index_error) => {
Ok(Self::StopIteration(None))
}
Err(err) if err.isinstance(&vm.ctx.exceptions.stop_iteration) => {
let args = err.get_arg(0);
Ok(Self::StopIteration(args))
}
Err(err) => Err(err),
}
}
}
impl IntoPyResult for PyIterReturn {