mschoi/RustPython
1
0
Fork 0
forked from Rust-related/RustPython
Code Pull Requests Actions Activity

iternext uses ptr

Browse Source
This commit is contained in:
Jeong YunWon
2021-10-15 06:50:48 +09:00
parent ad7925cac6
commit 08b5768a82
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -42,7 +42,7 @@ where
))
})?
};
iternext(self.0.borrow(), vm)
self.0.borrow().with_ptr(|zelf| iternext(zelf, vm))
}
pub fn iter<'a, 'b, U>(

4
vm/src/stdlib/io.rs
View File

@@ -525,8 +525,8 @@ mod _io {
}
impl IterNext for _IOBase {
fn slot_iternext(zelf: &PyObjectRef, vm: &VirtualMachine) -> PyResult<PyIterReturn> {
let line = vm.call_method(zelf, "readline", ())?;
fn slot_iternext(zelf: PyObjectPtr, vm: &VirtualMachine) -> PyResult<PyIterReturn> {
let line = vm.call_method(&*zelf, "readline", ())?;
Ok(if !line.clone().try_to_bool(vm)? {
PyIterReturn::StopIteration(None)
} else {

11
vm/src/types/slot.rs
View File

@@ -142,7 +142,7 @@ pub(crate) type RichCompareFunc = fn(
&VirtualMachine,
) -> PyResult<Either<PyObjectRef, PyComparisonValue>>;
pub(crate) type IterFunc = fn(PyObjectRef, &VirtualMachine) -> PyResult;
pub(crate) type IterNextFunc = fn(&PyObjectRef, &VirtualMachine) -> PyResult<PyIterReturn>;
pub(crate) type IterNextFunc = fn(PyObjectPtr, &VirtualMachine) -> PyResult<PyIterReturn>;
pub(crate) type DescrGetFunc =
fn(PyObjectRef, Option<PyObjectRef>, Option<PyObjectRef>, &VirtualMachine) -> PyResult;
pub(crate) type DescrSetFunc =
@@ -239,8 +239,8 @@ fn iter_wrapper(zelf: PyObjectRef, vm: &VirtualMachine) -> PyResult {
vm.call_special_method(zelf, "__iter__", ())
}
fn iternext_wrapper(zelf: &PyObjectRef, vm: &VirtualMachine) -> PyResult<PyIterReturn> {
PyIterReturn::from_pyresult(vm.call_special_method(zelf.clone(), "__next__", ()), vm)
fn iternext_wrapper(zelf: PyObjectPtr, vm: &VirtualMachine) -> PyResult<PyIterReturn> {
PyIterReturn::from_pyresult(vm.call_special_method((*zelf).clone(), "__next__", ()), vm)
}
fn descr_get_wrapper(
@@ -828,7 +828,7 @@ pub trait Iterable: PyValue {
#[pyimpl(with(Iterable))]
pub trait IterNext: PyValue + Iterable {
#[pyslot]
fn slot_iternext(zelf: &PyObjectRef, vm: &VirtualMachine) -> PyResult<PyIterReturn> {
fn slot_iternext(zelf: PyObjectPtr, vm: &VirtualMachine) -> PyResult<PyIterReturn> {
if let Some(zelf) = zelf.downcast_ref() {
Self::next(zelf, vm)
} else {
@@ -841,7 +841,8 @@ pub trait IterNext: PyValue + Iterable {
#[inline]
#[pymethod]
fn __next__(zelf: PyObjectRef, vm: &VirtualMachine) -> PyResult {
Self::slot_iternext(&zelf, vm).into_pyresult(vm)
zelf.with_ptr(|zelf| Self::slot_iternext(zelf, vm))
.into_pyresult(vm)
}
}