Skip to content

sequence, mapping slots and fix separate __delitem__ slots #6621

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 7 commits into from
Jan 1, 2026
Merged

sequence, mapping slots and fix separate __delitem__ slots #6621

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c7f5841
fix call
youknowone Jan 1, 2026
015f4b8
Remove repr pymethod
youknowone Jan 1, 2026
e625cc8
Remove __get__ and __set__ pymethod
youknowone Jan 1, 2026
76a6813
Remove __contains__ pymethod
youknowone Jan 1, 2026
8ffe90e
Remove __len__ pymethod
youknowone Jan 1, 2026
b408aba
mapping priors sequence
youknowone Jan 1, 2026
ab1cb9b
fix ctypes
youknowone Jan 1, 2026
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
Next Next commit
fix call
  • Loading branch information
@youknowone
youknowone committed Jan 1, 2026
commit c7f584117f7cbe03c70e666075d563ec9082d556
34 changes: 25 additions & 9 deletions crates/vm/src/builtins/descriptor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -487,7 +487,13 @@ impl core::fmt::Debug for SlotFunc {

impl SlotFunc {
/// Call the wrapped slot function with proper type handling
pub fn call(&self, obj: PyObjectRef, args: FuncArgs, vm: &VirtualMachine) -> PyResult {
pub fn call(
&self,
obj: PyObjectRef,
args: FuncArgs,
name: &str,
vm: &VirtualMachine,
) -> PyResult {
match self {
SlotFunc::Init(func) => {
func(obj, args, vm)?;
Expand Down Expand Up @@ -601,9 +607,13 @@ impl SlotFunc {
func(obj.sequence_unchecked(), index, vm)
}
SlotFunc::SeqAssItem(func) => {
let (index, value): (isize, crate::function::OptionalArg<PyObjectRef>) =
args.bind(vm)?;
func(obj.sequence_unchecked(), index, value.into_option(), vm)?;
if name == "__delitem__" {
let (index,): (isize,) = args.bind(vm)?;
func(obj.sequence_unchecked(), index, None, vm)?;
} else {
let (index, value): (isize, PyObjectRef) = args.bind(vm)?;
func(obj.sequence_unchecked(), index, Some(value), vm)?;
}
Ok(vm.ctx.none())
}
SlotFunc::SeqContains(func) => {
Expand All @@ -622,9 +632,13 @@ impl SlotFunc {
func(obj.mapping_unchecked(), &key, vm)
}
SlotFunc::MapAssSubscript(func) => {
let (key, value): (PyObjectRef, crate::function::OptionalArg<PyObjectRef>) =
args.bind(vm)?;
func(obj.mapping_unchecked(), &key, value.into_option(), vm)?;
if name == "__delitem__" {
let (key,): (PyObjectRef,) = args.bind(vm)?;
func(obj.mapping_unchecked(), &key, None, vm)?;
} else {
let (key, value): (PyObjectRef, PyObjectRef) = args.bind(vm)?;
func(obj.mapping_unchecked(), &key, Some(value), vm)?;
}
Ok(vm.ctx.none())
}
// Number sub-slots
Expand Down Expand Up @@ -711,7 +725,7 @@ impl Callable for PyWrapper {
)));
}

zelf.wrapped.call(obj, rest, vm)
zelf.wrapped.call(obj, rest, zelf.name.as_str(), vm)
}
}

Expand Down Expand Up @@ -783,7 +797,9 @@ impl Callable for PyMethodWrapper {
zelf.obj.class().name()
)));
}
zelf.wrapper.wrapped.call(zelf.obj.clone(), args, vm)
zelf.wrapper
.wrapped
.call(zelf.obj.clone(), args, zelf.wrapper.name.as_str(), vm)
}
}

Expand Down