Skip to content

Refactor repetive optional range pattern to OptionalRangeArgs #3944

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
youknowone merged 2 commits into from
Jul 23, 2022
Merged

Refactor repetive optional range pattern to OptionalRangeArgs #3944

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
84f5aa9
Refactor repetive optional range pattern to OptionalRangeArgs
youknowone Jul 21, 2022
90affcd
Remove `len` parameter from `saturate`
youknowone Jul 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 3 additions & 10 deletions stdlib/src/array.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ mod array {
BufferDescriptor, BufferMethods, BufferResizeGuard, PyBuffer, PyIterReturn,
PyMappingMethods,
},
sequence::{SequenceExt, SequenceMutExt},
sequence::{OptionalRangeArgs, SequenceExt, SequenceMutExt},
sliceable::{
SaturatedSlice, SequenceIndex, SequenceIndexOp, SliceableSequenceMutOp,
SliceableSequenceOp,
Expand Down Expand Up @@ -867,17 +867,10 @@ mod array {
fn index(
&self,
x: PyObjectRef,
start: OptionalArg<PyObjectRef>,
stop: OptionalArg<PyObjectRef>,
range: OptionalRangeArgs,
vm: &VirtualMachine,
) -> PyResult<usize> {
let len = self.len();
let saturate = |obj: PyObjectRef, len| -> PyResult<_> {
obj.try_into_value(vm)
.map(|int: PyIntRef| int.as_bigint().saturated_at(len))
};
let start = start.map_or(Ok(0), |obj| saturate(obj, len))?;
let stop = stop.map_or(Ok(len), |obj| saturate(obj, len))?;
let (start, stop) = range.saturate(self.len(), vm)?;
self.read().index(x, start, stop, vm)
}

Expand Down
17 changes: 5 additions & 12 deletions vm/src/builtins/list.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use super::{PositionIterInternal, PyGenericAlias, PyIntRef, PyTupleRef, PyType, PyTypeRef};
use super::{PositionIterInternal, PyGenericAlias, PyTupleRef, PyType, PyTypeRef};
use crate::common::lock::{
PyMappedRwLockReadGuard, PyMutex, PyRwLock, PyRwLockReadGuard, PyRwLockWriteGuard,
};
Expand All @@ -9,8 +9,8 @@ use crate::{
iter::PyExactSizeIterator,
protocol::{PyIterReturn, PyMappingMethods, PySequence, PySequenceMethods},
recursion::ReprGuard,
sequence::{MutObjectSequenceOp, SequenceExt, SequenceMutExt},
sliceable::{SequenceIndex, SequenceIndexOp, SliceableSequenceMutOp, SliceableSequenceOp},
sequence::{MutObjectSequenceOp, OptionalRangeArgs, SequenceExt, SequenceMutExt},
sliceable::{SequenceIndex, SliceableSequenceMutOp, SliceableSequenceOp},
types::{
AsMapping, AsSequence, Comparable, Constructor, Hashable, Initializer, IterNext,
IterNextIterable, Iterable, PyComparisonOp, Unconstructible, Unhashable,
Expand Down Expand Up @@ -269,17 +269,10 @@ impl PyList {
fn index(
&self,
needle: PyObjectRef,
start: OptionalArg<PyObjectRef>,
stop: OptionalArg<PyObjectRef>,
range: OptionalRangeArgs,
vm: &VirtualMachine,
) -> PyResult<usize> {
let len = self.len();
let saturate = |obj: PyObjectRef, len| -> PyResult<_> {
obj.try_into_value(vm)
.map(|int: PyIntRef| int.as_bigint().saturated_at(len))
};
let start = start.map_or(Ok(0), |obj| saturate(obj, len))?;
let stop = stop.map_or(Ok(len), |obj| saturate(obj, len))?;
let (start, stop) = range.saturate(self.len(), vm)?;
let index = self.mut_index_range(vm, &needle, start..stop)?;
if let Some(index) = index.into() {
Ok(index)
Expand Down
16 changes: 4 additions & 12 deletions vm/src/builtins/tuple.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use super::{PositionIterInternal, PyGenericAlias, PyIntRef, PyType, PyTypeRef};
use super::{PositionIterInternal, PyGenericAlias, PyType, PyTypeRef};
use crate::common::{hash::PyHash, lock::PyMutex};
use crate::{
class::PyClassImpl,
Expand All @@ -7,8 +7,7 @@ use crate::{
iter::PyExactSizeIterator,
protocol::{PyIterReturn, PyMappingMethods, PySequenceMethods},
recursion::ReprGuard,
sequence::SequenceExt,
sliceable::SequenceIndexOp,
sequence::{OptionalRangeArgs, SequenceExt},
sliceable::{SequenceIndex, SliceableSequenceOp},
types::{
AsMapping, AsSequence, Comparable, Constructor, Hashable, IterNext, IterNextIterable,
Expand Down Expand Up @@ -281,17 +280,10 @@ impl PyTuple {
fn index(
&self,
needle: PyObjectRef,
start: OptionalArg<PyObjectRef>,
stop: OptionalArg<PyObjectRef>,
range: OptionalRangeArgs,
vm: &VirtualMachine,
) -> PyResult<usize> {
let len = self.len();
let saturate = |obj: PyObjectRef, len| -> PyResult<_> {
obj.try_into_value(vm)
.map(|int: PyIntRef| int.as_bigint().saturated_at(len))
};
let start = start.map_or(Ok(0), |i| saturate(i, len))?;
let stop = stop.map_or(Ok(len), |i| saturate(i, len))?;
let (start, stop) = range.saturate(self.len(), vm)?;
for (index, element) in self
.elements
.iter()
Expand Down
24 changes: 23 additions & 1 deletion vm/src/sequence.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
use crate::{
function::{Either, PyComparisonValue},
builtins::PyIntRef,
function::{Either, OptionalArg, PyComparisonValue},
sliceable::SequenceIndexOp,
types::{richcompare_wrapper, PyComparisonOp, RichCompareFunc},
vm::VirtualMachine,
AsObject, PyObject, PyObjectRef, PyResult,
Expand Down Expand Up @@ -225,3 +227,23 @@ impl<T: Clone> SequenceMutExt<T> for Vec<T> {
self
}
}

#[derive(FromArgs)]
pub struct OptionalRangeArgs {
#[pyarg(positional, optional)]
start: OptionalArg<PyObjectRef>,
#[pyarg(positional, optional)]
stop: OptionalArg<PyObjectRef>,
}

impl OptionalRangeArgs {
pub fn saturate(self, len: usize, vm: &VirtualMachine) -> PyResult<(usize, usize)> {
let saturate = |obj: PyObjectRef| -> PyResult<_> {
obj.try_into_value(vm)
.map(|int: PyIntRef| int.as_bigint().saturated_at(len))
};
let start = self.start.map_or(Ok(0), saturate)?;
let stop = self.stop.map_or(Ok(len), saturate)?;
Ok((start, stop))
}
}
15 changes: 4 additions & 11 deletions vm/src/stdlib/collections.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ mod _collections {
use crate::{
builtins::{
IterStatus::{Active, Exhausted},
PositionIterInternal, PyGenericAlias, PyInt, PyIntRef, PyTypeRef,
PositionIterInternal, PyGenericAlias, PyInt, PyTypeRef,
},
common::lock::{PyMutex, PyRwLock, PyRwLockReadGuard, PyRwLockWriteGuard},
function::{FuncArgs, KwArgs, OptionalArg, PyComparisonValue},
iter::PyExactSizeIterator,
protocol::{PyIterReturn, PySequenceMethods},
recursion::ReprGuard,
sequence::MutObjectSequenceOp,
sequence::{MutObjectSequenceOp, OptionalRangeArgs},
sliceable::SequenceIndexOp,
types::{
AsSequence, Comparable, Constructor, Hashable, Initializer, IterNext, IterNextIterable,
Expand Down Expand Up @@ -157,19 +157,12 @@ mod _collections {
fn index(
&self,
needle: PyObjectRef,
start: OptionalArg<PyObjectRef>,
stop: OptionalArg<PyObjectRef>,
range: OptionalRangeArgs,
vm: &VirtualMachine,
) -> PyResult<usize> {
let start_state = self.state.load();

let len = self.len();
let saturate = |obj: PyObjectRef, len| -> PyResult<_> {
obj.try_into_value(vm)
.map(|int: PyIntRef| int.as_bigint().saturated_at(len))
};
let start = start.map_or(Ok(0), |i| saturate(i, len))?;
let stop = stop.map_or(Ok(len), |i| saturate(i, len))?;
let (start, stop) = range.saturate(self.len(), vm)?;
let index = self.mut_index_range(vm, &needle, start..stop)?;
if start_state != self.state.load() {
Err(vm.new_runtime_error("deque mutated during iteration".to_owned()))
Expand Down