unify slots

youknowone · youknowone · commit a6dbe23a5ade · 2025-12-27T23:22:44.000+09:00
diff --git a/.cspell.dict/cpython.txt b/.cspell.dict/cpython.txt
@@ -51,6 +51,7 @@ prec
 preinitialized
 pythonw
 PYTHREAD_NAME
+releasebuffer
 SA_ONSTACK
 SOABI
 stackdepth
diff --git a/crates/vm/src/builtins/type.rs b/crates/vm/src/builtins/type.rs
@@ -465,7 +465,7 @@ impl PyType {
     /// Inherit slots from base type. inherit_slots
     pub(crate) fn inherit_slots(&self, base: &Self) {
         // Use SLOT_DEFS to iterate all slots
-        // Note: as_buffer is handled in inherit_static_slots (not AtomicCell)
+        // Note: as_buffer is handled in inherit_readonly_slots (not AtomicCell)
         for def in SLOT_DEFS {
             def.accessor.copyslot_if_none(self, base);
         }
diff --git a/crates/vm/src/class.rs b/crates/vm/src/class.rs
@@ -35,7 +35,7 @@ fn add_operators(class: &'static Py<PyType>, ctx: &Context) {
         }
 
         // Get the slot function wrapped in SlotFunc
-        let Some(slot_func) = def.accessor.get_slot_func(&class.slots) else {
+        let Some(slot_func) = def.accessor.get_slot_func_with_op(&class.slots, def.op) else {
             continue;
         };
 
diff --git a/crates/vm/src/protocol/number.rs b/crates/vm/src/protocol/number.rs
@@ -256,6 +256,7 @@ pub struct PyNumberSlots {
     pub int: AtomicCell<Option<PyNumberUnaryFunc>>,
     pub float: AtomicCell<Option<PyNumberUnaryFunc>>,
 
+    // Right variants (internal - not exposed in SlotAccessor)
     pub right_add: AtomicCell<Option<PyNumberBinaryFunc>>,
     pub right_subtract: AtomicCell<Option<PyNumberBinaryFunc>>,
     pub right_multiply: AtomicCell<Option<PyNumberBinaryFunc>>,
@@ -295,8 +296,7 @@ pub struct PyNumberSlots {
 
 impl From<&PyNumberMethods> for PyNumberSlots {
     fn from(value: &PyNumberMethods) -> Self {
-        // right_* functions will use the same left function as PyNumberMethods
-        // allows both f(self, other) and f(other, self)
+        // right_* slots use the same function as left ops for native types
         Self {
             add: AtomicCell::new(value.add),
             subtract: AtomicCell::new(value.subtract),
diff --git a/crates/vm/src/types/slot.rs b/crates/vm/src/types/slot.rs
diff --git a/crates/vm/src/types/slot_defs.rs b/crates/vm/src/types/slot_defs.rs

Original file line number	Diff line number	Diff line change
`@@ -465,7 +465,7 @@ impl PyType {`
`465`	`465`	`/// Inherit slots from base type. inherit_slots`
`466`	`466`	`pub(crate) fn inherit_slots(&self, base: &Self) {`
`467`	`467`	`// Use SLOT_DEFS to iterate all slots`
`468`		`- // Note: as_buffer is handled in inherit_static_slots (not AtomicCell)`
	`468`	`+ // Note: as_buffer is handled in inherit_readonly_slots (not AtomicCell)`
`469`	`469`	`for def in SLOT_DEFS {`
`470`	`470`	`def.accessor.copyslot_if_none(self, base);`
`471`	`471`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ fn add_operators(class: &'static Py<PyType>, ctx: &Context) {`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`// Get the slot function wrapped in SlotFunc`
`38`		`- let Some(slot_func) = def.accessor.get_slot_func(&class.slots) else {`
	`38`	`+ let Some(slot_func) = def.accessor.get_slot_func_with_op(&class.slots, def.op) else {`
`39`	`39`	`continue;`
`40`	`40`	`};`
`41`	`41`