From 89e3587c154e73b679d56edaffbb6a1ac8126190 Mon Sep 17 00:00:00 2001
From: Jeong YunWon <jeong@youknowone.org>
Date: Thu, 20 Apr 2023 15:57:32 +0900
Subject: [PATCH] Simplify repr implementation a bit

---
 vm/src/builtins/code.rs | 25 +-------------
 vm/src/stdlib/io.rs     | 76 ++++++++++++-----------------------------
 2 files changed, 22 insertions(+), 79 deletions(-)

diff --git a/vm/src/builtins/code.rs b/vm/src/builtins/code.rs
index 797825dfe..faf80a8f6 100644
--- a/vm/src/builtins/code.rs
+++ b/vm/src/builtins/code.rs
@@ -230,7 +230,7 @@ impl Representable for PyCode {
     }
 }
 
-#[pyclass(with(Py, Representable))]
+#[pyclass(with(Representable))]
 impl PyCode {
     #[pyslot]
     fn slot_new(_cls: PyTypeRef, _args: FuncArgs, vm: &VirtualMachine) -> PyResult {
@@ -418,29 +418,6 @@ impl PyCode {
     }
 }
 
-#[pyclass(with(Representable))]
-impl Py<PyCode> {}
-
-impl PyPayload for Py<PyCode> {
-    fn class(ctx: &Context) -> &'static Py<PyType> {
-        ctx.types.code_type
-    }
-}
-
-impl Representable for Py<PyCode> {
-    #[inline]
-    fn repr_str(zelf: &Py<Self>, _vm: &VirtualMachine) -> PyResult<String> {
-        let code = &zelf.code;
-        Ok(format!(
-            "<code object {} at {:#x} file {:?}, line {}>",
-            code.obj_name,
-            zelf.get_id(),
-            code.source_path.as_str(),
-            code.first_line_number
-        ))
-    }
-}
-
 impl fmt::Display for PyCode {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         (**self).fmt(f)
diff --git a/vm/src/stdlib/io.rs b/vm/src/stdlib/io.rs
index 07e39f194..8c0e3cd4a 100644
--- a/vm/src/stdlib/io.rs
+++ b/vm/src/stdlib/io.rs
@@ -12,7 +12,6 @@ cfg_if::cfg_if! {
 use crate::{
     builtins::PyBaseExceptionRef,
     convert::{IntoPyException, ToPyException, ToPyObject},
-    types::Representable,
     PyObjectRef, PyResult, TryFromObject, VirtualMachine,
 };
 pub use _io::io_open as open;
@@ -1526,6 +1525,24 @@ mod _io {
             vm.call_method(self.lock(vm)?.check_init(vm)?, "isatty", ())
         }
 
+        #[pyslot]
+        fn slot_repr(zelf: &PyObject, vm: &VirtualMachine) -> PyResult<PyStrRef> {
+            let name_repr = repr_fileobj_name(zelf, vm)?;
+            let cls = zelf.class();
+            let slot_name = cls.slot_name();
+            let repr = if let Some(name_repr) = name_repr {
+                format!("<{slot_name} name={name_repr}>")
+            } else {
+                format!("<{slot_name}>")
+            };
+            Ok(vm.ctx.new_str(repr))
+        }
+
+        #[pymethod(magic)]
+        fn repr(zelf: PyObjectRef, vm: &VirtualMachine) -> PyResult<PyStrRef> {
+            Self::slot_repr(&zelf, vm)
+        }
+
         fn close_strict(&self, vm: &VirtualMachine) -> PyResult {
             let mut data = self.lock(vm)?;
             let raw = data.check_init(vm)?;
@@ -1672,28 +1689,13 @@ mod _io {
     }
 
     #[pyclass(
-        with(DefaultConstructor, BufferedMixin, BufferedReadable, Representable),
+        with(DefaultConstructor, BufferedMixin, BufferedReadable),
         flags(BASETYPE, HAS_DICT)
     )]
     impl BufferedReader {}
 
     impl DefaultConstructor for BufferedReader {}
 
-    impl Representable for BufferedReader {
-        #[inline]
-        fn repr_str(zelf: &Py<Self>, vm: &VirtualMachine) -> PyResult<String> {
-            let name_repr = repr_fileobj_name(zelf.as_object(), vm)?;
-            let cls = zelf.class();
-            let slot_name = cls.slot_name();
-            let repr = if let Some(name_repr) = name_repr {
-                format!("<{slot_name} name={name_repr}>")
-            } else {
-                format!("<{slot_name}>")
-            };
-            Ok(repr)
-        }
-    }
-
     #[pyclass]
     trait BufferedWritable: PyPayload {
         type Writer: BufferedMixin;
@@ -1737,28 +1739,13 @@ mod _io {
     }
 
     #[pyclass(
-        with(DefaultConstructor, BufferedMixin, BufferedWritable, Representable),
+        with(DefaultConstructor, BufferedMixin, BufferedWritable),
         flags(BASETYPE, HAS_DICT)
     )]
     impl BufferedWriter {}
 
     impl DefaultConstructor for BufferedWriter {}
 
-    impl Representable for BufferedWriter {
-        #[inline]
-        fn repr_str(zelf: &Py<Self>, vm: &VirtualMachine) -> PyResult<String> {
-            let name_repr = repr_fileobj_name(zelf.as_object(), vm)?;
-            let cls = zelf.class();
-            let slot_name = cls.slot_name();
-            let repr = if let Some(name_repr) = name_repr {
-                format!("<{slot_name} name={name_repr}>")
-            } else {
-                format!("<{slot_name}>")
-            };
-            Ok(repr)
-        }
-    }
-
     #[pyattr]
     #[pyclass(name = "BufferedRandom", base = "_BufferedIOBase")]
     #[derive(Debug, Default, PyPayload)]
@@ -1788,34 +1775,13 @@ mod _io {
     }
 
     #[pyclass(
-        with(
-            DefaultConstructor,
-            BufferedMixin,
-            BufferedReadable,
-            BufferedWritable,
-            Representable
-        ),
+        with(DefaultConstructor, BufferedMixin, BufferedReadable, BufferedWritable),
         flags(BASETYPE, HAS_DICT)
     )]
     impl BufferedRandom {}
 
     impl DefaultConstructor for BufferedRandom {}
 
-    impl Representable for BufferedRandom {
-        #[inline]
-        fn repr_str(zelf: &Py<Self>, vm: &VirtualMachine) -> PyResult<String> {
-            let name_repr = repr_fileobj_name(zelf.as_object(), vm)?;
-            let cls = zelf.class();
-            let slot_name = cls.slot_name();
-            let repr = if let Some(name_repr) = name_repr {
-                format!("<{slot_name} name={name_repr}>")
-            } else {
-                format!("<{slot_name}>")
-            };
-            Ok(repr)
-        }
-    }
-
     #[pyattr]
     #[pyclass(name = "BufferedRWPair", base = "_BufferedIOBase")]
     #[derive(Debug, Default, PyPayload)]