Skip to content

Implement Mapping Protocol #3121

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 14 commits into from
Oct 2, 2021
Merged

Implement Mapping Protocol #3121

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
14ce6aa
add slot_as_mapping slots with atomic cell
Snowapril Sep 20, 2021
77351b3
add PyMapping struct for mapping protocol
Snowapril Sep 20, 2021
1b6cdf5
rename length to compute_length
Snowapril Sep 20, 2021
fc761b4
add mapping protocol to proper types
Snowapril Sep 20, 2021
e83b68b
apply mapping protocol in itemprotocol
Snowapril Sep 20, 2021
b197a17
switch RangeIndex to PyObjectRef
Snowapril Sep 22, 2021
4f009ef
switch SequenceIndex to PyObjectRef
Snowapril Sep 22, 2021
1fbbdaa
support delitem in ass_subscript
Snowapril Sep 22, 2021
6e11b89
add mapping protocol methods to update_slot
Snowapril Sep 29, 2021
9e5120d
add mapping type check to mappingproxy
Snowapril Sep 29, 2021
4fd0681
move mapping protocol to rustpython_vm::protocol
Snowapril Sep 29, 2021
aa2a7f0
add PyMapping as PyObjectRef wrapper
Snowapril Sep 30, 2021
a81b3f9
fix posix & winapi to use proper PyMapping
Snowapril Oct 2, 2021
7b0965c
turn unreachable function to cold
youknowone Oct 2, 2021
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
Prev Previous commit
Next Next commit
switch SequenceIndex to PyObjectRef 
As `getitem` and `setitem methods in other types,
get second argument as PyObjectRef.
  • Loading branch information
@Snowapril
Snowapril committed Oct 2, 2021
commit 4f009ef9712fe7c95a5bc364fe48931909807f3d
23 changes: 10 additions & 13 deletions vm/src/builtins/memory.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ use crate::{
slots::{AsBuffer, AsMapping, Comparable, Hashable, PyComparisonOp, SlotConstructor},
stdlib::pystruct::FormatSpec,
utils::Either,
IdProtocol, IntoPyObject, PyClassImpl, PyComparisonValue, PyContext, PyObjectRef, PyRef,
PyResult, PyValue, TryFromBorrowedObject, TryFromObject, TypeProtocol, VirtualMachine,
IdProtocol, IntoPyObject, PyClassDef, PyClassImpl, PyComparisonValue, PyContext, PyObjectRef,
PyRef, PyResult, PyValue, TryFromBorrowedObject, TryFromObject, TypeProtocol, VirtualMachine,
};
use crossbeam_utils::atomic::AtomicCell;
use itertools::Itertools;
Expand Down Expand Up @@ -343,10 +343,10 @@ impl PyMemoryView {
}

#[pymethod(magic)]
fn getitem(zelf: PyRef<Self>, needle: SequenceIndex, vm: &VirtualMachine) -> PyResult {
fn getitem(zelf: PyRef<Self>, needle: PyObjectRef, vm: &VirtualMachine) -> PyResult {
zelf.try_not_released(vm)?;
match needle {
SequenceIndex::Int(i) => Self::getitem_by_idx(zelf, i, vm),
match SequenceIndex::try_from_object_for(vm, needle, Self::NAME)? {
SequenceIndex::Int(index) => Self::getitem_by_idx(zelf, index, vm),
SequenceIndex::Slice(slice) => Self::getitem_by_slice(zelf, slice, vm),
}
}
Expand Down Expand Up @@ -460,16 +460,16 @@ impl PyMemoryView {
#[pymethod(magic)]
fn setitem(
zelf: PyRef<Self>,
needle: SequenceIndex,
needle: PyObjectRef,
value: PyObjectRef,
vm: &VirtualMachine,
) -> PyResult<()> {
zelf.try_not_released(vm)?;
if zelf.buffer.options.readonly {
return Err(vm.new_type_error("cannot modify read-only memory".to_owned()));
}
match needle {
SequenceIndex::Int(i) => Self::setitem_by_idx(zelf, i, value, vm),
match SequenceIndex::try_from_object_for(vm, needle, Self::NAME)? {
SequenceIndex::Int(index) => Self::setitem_by_idx(zelf, index, value, vm),
SequenceIndex::Slice(slice) => Self::setitem_by_slice(zelf, slice, value, vm),
}
}
Expand Down Expand Up @@ -751,8 +751,7 @@ impl AsMapping for PyMemoryView {

#[inline]
fn subscript(zelf: PyObjectRef, needle: PyObjectRef, vm: &VirtualMachine) -> PyResult {
Self::downcast(zelf, vm)
.map(|zelf| Self::getitem(zelf, SequenceIndex::try_from_object(vm, needle)?, vm))?
Self::downcast(zelf, vm).map(|zelf| Self::getitem(zelf, needle, vm))?
}

#[inline]
Expand All @@ -762,9 +761,7 @@ impl AsMapping for PyMemoryView {
value: PyObjectRef,
vm: &VirtualMachine,
) -> PyResult<()> {
Self::downcast(zelf, vm).map(|zelf| {
Self::setitem(zelf, SequenceIndex::try_from_object(vm, needle)?, value, vm)
})?
Self::downcast(zelf, vm).map(|zelf| Self::setitem(zelf, needle, value, vm))?
}
}

Expand Down