slot_repr for structseq

youknowone · youknowone · commit d0ae853b0b05 · 2025-06-27T21:58:31.000+09:00
diff --git a/vm/src/protocol/object.rs b/vm/src/protocol/object.rs
@@ -332,9 +332,10 @@ impl PyObject {
         vm.with_recursion("while getting the repr of an object", || {
             match self.class().slots.repr.load() {
                 Some(slot) => slot(self, vm),
-                None => vm
-                    .call_special_method(self, identifier!(vm, __repr__), ())?
-                    .try_into_value(vm), // TODO: remove magic method call once __repr__ is fully ported to slot
+                None => Err(vm.new_runtime_error(format!(
+                    "BUG: object of type '{}' has no __repr__ method. This is a bug in RustPython.",
+                    self.class().name()
+                ))),
             }
         })
     }
diff --git a/vm/src/types/structseq.rs b/vm/src/types/structseq.rs
@@ -1,6 +1,6 @@
 use crate::{
-    AsObject, Py, PyObjectRef, PyPayload, PyRef, PyResult, VirtualMachine,
-    builtins::{PyBaseExceptionRef, PyTuple, PyTupleRef, PyType},
+    AsObject, Py, PyObject, PyObjectRef, PyPayload, PyRef, PyResult, VirtualMachine,
+    builtins::{PyBaseExceptionRef, PyStrRef, PyTuple, PyTupleRef, PyType},
     class::{PyClassImpl, StaticType},
     vm::Context,
 };
@@ -47,31 +47,40 @@ pub trait PyStructSequence: StaticType + PyClassImpl + Sized + 'static {
         Ok(seq)
     }
 
-    #[pymethod]
-    fn __repr__(zelf: PyRef<PyTuple>, vm: &VirtualMachine) -> PyResult<String> {
+    #[pyslot]
+    fn slot_repr(zelf: &PyObject, vm: &VirtualMachine) -> PyResult<PyStrRef> {
+        let zelf = zelf
+            .downcast_ref::<PyTuple>()
+            .ok_or_else(|| vm.new_type_error("unexpected payload for __repr__"))?;
+
         let format_field = |(value, name): (&PyObjectRef, _)| {
             let s = value.repr(vm)?;
             Ok(format!("{name}={s}"))
         };
-        let (body, suffix) = if let Some(_guard) =
-            rustpython_vm::recursion::ReprGuard::enter(vm, zelf.as_object())
-        {
-            if Self::REQUIRED_FIELD_NAMES.len() == 1 {
-                let value = zelf.first().unwrap();
-                let formatted = format_field((value, Self::REQUIRED_FIELD_NAMES[0]))?;
-                (formatted, ",")
+        let (body, suffix) =
+            if let Some(_guard) = rustpython_vm::recursion::ReprGuard::enter(vm, zelf.as_ref()) {
+                if Self::REQUIRED_FIELD_NAMES.len() == 1 {
+                    let value = zelf.first().unwrap();
+                    let formatted = format_field((value, Self::REQUIRED_FIELD_NAMES[0]))?;
+                    (formatted, ",")
+                } else {
+                    let fields: PyResult<Vec<_>> = zelf
+                        .iter()
+                        .zip(Self::REQUIRED_FIELD_NAMES.iter().copied())
+                        .map(format_field)
+                        .collect();
+                    (fields?.join(", "), "")
+                }
             } else {
-                let fields: PyResult<Vec<_>> = zelf
-                    .iter()
-                    .zip(Self::REQUIRED_FIELD_NAMES.iter().copied())
-                    .map(format_field)
-                    .collect();
-                (fields?.join(", "), "")
-            }
-        } else {
-            (String::new(), "...")
-        };
-        Ok(format!("{}({}{})", Self::TP_NAME, body, suffix))
+                (String::new(), "...")
+            };
+        let repr_str = format!("{}({}{})", Self::TP_NAME, body, suffix);
+        Ok(vm.ctx.new_str(repr_str))
+    }
+
+    #[pymethod]
+    fn __repr__(zelf: PyObjectRef, vm: &VirtualMachine) -> PyResult<PyStrRef> {
+        Self::slot_repr(&zelf, vm)
     }
 
     #[pymethod]

Original file line number	Diff line number	Diff line change
`@@ -332,9 +332,10 @@ impl PyObject {`
`332`	`332`	`vm.with_recursion("while getting the repr of an object", \|\| {`
`333`	`333`	`match self.class().slots.repr.load() {`
`334`	`334`	`Some(slot) => slot(self, vm),`
`335`		`- None => vm`
`336`		`- .call_special_method(self, identifier!(vm, __repr__), ())?`
`337`		`- .try_into_value(vm), // TODO: remove magic method call once __repr__ is fully ported to slot`
	`335`	`+ None => Err(vm.new_runtime_error(format!(`
	`336`	`+ "BUG: object of type '{}' has no __repr__ method. This is a bug in RustPython.",`
	`337`	`+ self.class().name()`
	`338`	`+ ))),`
`338`	`339`	`}`
`339`	`340`	`})`
`340`	`341`	`}`