fix new

youknowone · youknowone · commit 45a697681719 · 2021-09-15T08:23:28.000+09:00
diff --git a/vm/src/builtins/object.rs b/vm/src/builtins/object.rs
@@ -2,17 +2,15 @@ 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;
 use crate::utils::Either;
 use crate::vm::VirtualMachine;
 use crate::{
     IdProtocol, ItemProtocol, PyArithmaticValue, PyAttributes, PyClassImpl, PyComparisonValue,
-    PyContext, PyObject, PyObjectRef, PyResult, PyValue, TypeProtocol,
+    PyContext, PyObject, PyObjectRef, PyRef, PyResult, PyValue, TypeProtocol,
 };
 
 /// object()
@@ -34,11 +32,6 @@ impl PyValue for PyBaseObject {
 
 #[pyimpl(flags(BASETYPE))]
 impl PyBaseObject {
-    #[pyclassmethod(magic)]
-    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,19 @@ 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);
+    let class = &ctx.types.object_type;
+
+    let new_str = "__new__";
+    let tp_new_wrapper = PyRef::new_ref(
+        ctx.make_funcdef(new_str, PyType::__new__).into_function(),
+        ctx.types.builtin_function_or_method_type.clone(),
+        None,
+    )
+    .into_object();
+    let bound = ctx.new_bound_method(tp_new_wrapper, class.clone().into_object());
+    class.set_str_attr(new_str, bound);
 }
 
 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,6 +239,12 @@ impl PyTypeRef {
 
 #[pyimpl(with(SlotGetattro, SlotSetattro, Callable), flags(BASETYPE))]
 impl PyType {
+    // 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)?;
+        call_tp_new(zelf, subtype, args, vm)
+    }
+
     #[pyproperty(name = "__mro__")]
     fn get_mro(zelf: PyRef<Self>) -> PyTuple {
         let elements: Vec<PyObjectRef> = zelf.iter_mro().map(|x| x.as_object().clone()).collect();
