fix __new__ as bound method for every type

youknowone · youknowone · commit 00b33f80c8bc · 2021-09-15T09:01:24.000+09:00
diff --git a/vm/src/builtins/object.rs b/vm/src/builtins/object.rs
@@ -2,9 +2,7 @@ use super::dict::{PyDict, PyDictRef};
 use super::list::PyList;
 use super::pybool;
 use super::pystr::{PyStr, PyStrRef};
-use super::pytype::PyTypeRef;
-use crate::builtins::pytype;
-use crate::builtins::pytype::PyType;
+use super::pytype::{PyType, PyTypeRef};
 use crate::common::hash::PyHash;
 use crate::function::FuncArgs;
 use crate::slots::PyComparisonOp;
@@ -34,11 +32,6 @@ impl PyValue for PyBaseObject {
 
 #[pyimpl(flags(BASETYPE))]
 impl PyBaseObject {
-    #[pyclassmethod(magic)]
-    pub(crate) fn new(cls: PyTypeRef, args: FuncArgs, vm: &VirtualMachine) -> PyResult {
-        let (subtype, args): (PyTypeRef, FuncArgs) = args.bind(vm)?;
-        pytype::call_tp_new(cls, subtype, args, vm)
-    }
     /// Create and return a new object.  See help(type) for accurate signature.
     #[pyslot]
     fn tp_new(cls: PyTypeRef, _args: FuncArgs, vm: &VirtualMachine) -> PyResult {
@@ -370,8 +363,8 @@ pub(crate) fn setattr(
     }
 }
 
-pub fn init(context: &PyContext) {
-    PyBaseObject::extend_class(context, &context.types.object_type);
+pub fn init(ctx: &PyContext) {
+    PyBaseObject::extend_class(ctx, &ctx.types.object_type);
 }
 
 fn common_reduce(obj: PyObjectRef, proto: usize, vm: &VirtualMachine) -> PyResult {
diff --git a/vm/src/builtins/pytype.rs b/vm/src/builtins/pytype.rs
@@ -239,7 +239,7 @@ impl PyTypeRef {
 
 #[pyimpl(with(SlotGetattro, SlotSetattro, Callable), flags(BASETYPE))]
 impl PyType {
-    #[pymethod]
+    // bound method for every type
     pub(crate) fn __new__(zelf: PyRef<Self>, args: FuncArgs, vm: &VirtualMachine) -> PyResult {
         let (subtype, args): (PyRef<Self>, FuncArgs) = args.bind(vm)?;
         if !subtype.issubclass(&zelf) {
diff --git a/vm/src/pyobject.rs b/vm/src/pyobject.rs
@@ -126,7 +126,7 @@ impl PyContext {
 
         let new_str = PyRef::new_ref(pystr::PyStr::from("__new__"), types.str_type.clone(), None);
         let tp_new_wrapper = create_object(
-            PyNativeFuncDef::new(object::PyBaseObject::new.into_func(), new_str).into_function(),
+            PyNativeFuncDef::new(PyType::__new__.into_func(), new_str).into_function(),
             &types.builtin_function_or_method_type,
         )
         .into_object();
@@ -1095,6 +1095,11 @@ pub trait PyClassImpl: PyClassDef {
         if let Some(module_name) = Self::MODULE_NAME {
             class.set_str_attr("__module__", ctx.new_str(module_name));
         }
+        if class.slots.new.load().is_some() {
+            let bound =
+                ctx.new_bound_method(ctx.tp_new_wrapper.clone(), class.clone().into_object());
+            class.set_str_attr("__new__", bound);
+        }
     }
 
     fn make_class(ctx: &PyContext) -> PyTypeRef

Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ impl PyContext {`
`126`	`126`
`127`	`127`	`let new_str = PyRef::new_ref(pystr::PyStr::from("__new__"), types.str_type.clone(), None);`
`128`	`128`	`let tp_new_wrapper = create_object(`
`129`		`- PyNativeFuncDef::new(object::PyBaseObject::new.into_func(), new_str).into_function(),`
	`129`	`+ PyNativeFuncDef::new(PyType::__new__.into_func(), new_str).into_function(),`
`130`	`130`	`&types.builtin_function_or_method_type,`
`131`	`131`	`)`
`132`	`132`	`.into_object();`
`@@ -1095,6 +1095,11 @@ pub trait PyClassImpl: PyClassDef {`
`1095`	`1095`	`if let Some(module_name) = Self::MODULE_NAME {`
`1096`	`1096`	`class.set_str_attr("__module__", ctx.new_str(module_name));`
`1097`	`1097`	`}`
	`1098`	`+ if class.slots.new.load().is_some() {`
	`1099`	`+ let bound =`
	`1100`	`+ ctx.new_bound_method(ctx.tp_new_wrapper.clone(), class.clone().into_object());`
	`1101`	`+ class.set_str_attr("__new__", bound);`
	`1102`	`+ }`
`1098`	`1103`	`}`
`1099`	`1104`
`1100`	`1105`	`fn make_class(ctx: &PyContext) -> PyTypeRef`