module init

youknowone · youknowone · commit 0813c82bca85 · 2022-05-12T19:46:41.000+09:00
diff --git a/vm/src/builtins/module.rs b/vm/src/builtins/module.rs
@@ -1,6 +1,7 @@
 use super::pystr::IntoPyStrRef;
 use super::{PyDictRef, PyStr, PyStrRef, PyTypeRef};
 use crate::{
+    builtins::PyStrInterned,
     class::PyClassImpl,
     convert::ToPyObject,
     function::FuncArgs,
@@ -92,12 +93,12 @@ impl Py<PyModule> {
     // TODO: should be on PyModule, not Py<PyModule>
     pub(crate) fn init_module_dict(
         &self,
-        name: PyObjectRef,
+        name: &'static PyStrInterned,
         doc: PyObjectRef,
         vm: &VirtualMachine,
     ) {
         let dict = self.dict();
-        dict.set_item("__name__", name, vm)
+        dict.set_item("__name__", name.to_object(), vm)
             .expect("Failed to set __name__ on module");
         dict.set_item("__doc__", doc, vm)
             .expect("Failed to set __doc__ on module");
@@ -131,7 +132,11 @@ impl Initializer for PyModule {
             .slots
             .flags
             .has_feature(crate::types::PyTypeFlags::HAS_DICT));
-        zelf.init_module_dict(args.name.into(), args.doc.to_pyobject(vm), vm);
+        zelf.init_module_dict(
+            vm.ctx.intern_string(args.name.as_str()),
+            args.doc.to_pyobject(vm),
+            vm,
+        );
         Ok(())
     }
 }
diff --git a/vm/src/builtins/object.rs b/vm/src/builtins/object.rs
@@ -309,15 +309,11 @@ impl PyBaseObject {
 
     #[pymethod(magic)]
     fn reduce_ex(obj: PyObjectRef, proto: usize, vm: &VirtualMachine) -> PyResult {
-        if let Some(reduce) = vm.get_attribute_opt(obj.clone(), interned!(vm, __reduce__))? {
-            let object_reduce = vm
-                .ctx
-                .types
-                .object_type
-                .get_attr(interned!(vm, __reduce__))
-                .unwrap();
+        let __reduce__ = interned!(vm, __reduce__);
+        if let Some(reduce) = vm.get_attribute_opt(obj.clone(), __reduce__)? {
+            let object_reduce = vm.ctx.types.object_type.get_attr(__reduce__).unwrap();
             let typ_obj: PyObjectRef = obj.class().clone().into();
-            let class_reduce = typ_obj.get_attr(interned!(vm, __reduce__), vm)?;
+            let class_reduce = typ_obj.get_attr(__reduce__, vm)?;
             if !class_reduce.is(&object_reduce) {
                 return vm.invoke(&reduce, ());
             }
diff --git a/vm/src/protocol/object.rs b/vm/src/protocol/object.rs
@@ -138,11 +138,8 @@ impl PyObject {
         vm: &VirtualMachine,
     ) -> PyResult<()> {
         vm_trace!("object.__setattr__({:?}, {}, {:?})", obj, attr_name, value);
-        if let Some(attr) = vm
-            .ctx
-            .interned_string(attr_name.as_str())
-            .and_then(|attr_name| self.get_class_attr(attr_name))
-        {
+        let cls_attr_name = vm.ctx.intern_string(attr_name.as_str());
+        if let Some(attr) = self.get_class_attr(cls_attr_name) {
             let descr_set = attr.class().mro_find_map(|cls| cls.slots.descr_set.load());
             if let Some(descriptor) = descr_set {
                 return descriptor(attr, self.to_owned(), value, vm);
diff --git a/vm/src/vm/mod.rs b/vm/src/vm/mod.rs
@@ -23,7 +23,7 @@ use crate::{
     },
     bytecode,
     codecs::CodecsRegistry,
-    common::{ascii, hash::HashSecret, lock::PyMutex, rc::PyRc},
+    common::{hash::HashSecret, lock::PyMutex, rc::PyRc},
     convert::{ToPyObject, TryFromObject},
     frame::{ExecutionResult, Frame, FrameRef},
     frozen,
@@ -160,13 +160,10 @@ impl VirtualMachine {
         let frozen = frozen::map_frozen(&vm, frozen::get_module_inits()).collect();
         PyRc::get_mut(&mut vm.state).unwrap().frozen = frozen;
 
-        vm.builtins.init_module_dict(
-            vm.ctx.new_str(ascii!("builtins")).into(),
-            vm.ctx.none(),
-            &vm,
-        );
+        vm.builtins
+            .init_module_dict(vm.ctx.intern_string("builtins"), vm.ctx.none(), &vm);
         vm.sys_module
-            .init_module_dict(vm.ctx.new_str(ascii!("sys")).into(), vm.ctx.none(), &vm);
+            .init_module_dict(vm.ctx.intern_string("sys"), vm.ctx.none(), &vm);
 
         vm
     }
diff --git a/vm/src/vm/vm_new.rs b/vm/src/vm/vm_new.rs
@@ -39,7 +39,7 @@ impl VirtualMachine {
     pub fn new_module(&self, name: &str, dict: PyDictRef, doc: Option<&str>) -> PyObjectRef {
         let module = PyRef::new_ref(PyModule {}, self.ctx.types.module_type.clone(), Some(dict));
         module.init_module_dict(
-            self.new_pyobj(name.to_owned()),
+            self.ctx.intern_string(name),
             doc.map(|doc| self.new_pyobj(doc.to_owned()))
                 .unwrap_or_else(|| self.ctx.none()),
             self,
