Add new to objmodule and change __name__ to property

palaviv · palaviv · commit fe0284aa05ae · 2019-06-10T19:18:32.000+03:00
diff --git a/vm/src/obj/objmodule.rs b/vm/src/obj/objmodule.rs
@@ -1,3 +1,5 @@
+use crate::obj::objproperty::PropertyBuilder;
+use crate::obj::objstr::PyStringRef;
 use crate::obj::objtype::PyClassRef;
 use crate::pyobject::{PyContext, PyRef, PyResult, PyValue};
 use crate::vm::VirtualMachine;
@@ -15,6 +17,12 @@ impl PyValue for PyModule {
 }
 
 impl PyModuleRef {
+    fn new(cls: PyClassRef, name: PyStringRef, vm: &VirtualMachine) -> PyResult<PyModuleRef> {
+        PyModule {
+            name: name.as_str().to_string(),
+        }
+        .into_ref_with_type(vm, cls)
+    }
     fn dir(self: PyModuleRef, vm: &VirtualMachine) -> PyResult {
         if let Some(dict) = &self.into_object().dict {
             let keys = dict.into_iter().map(|(k, _v)| k.clone()).collect();
@@ -24,14 +32,17 @@ impl PyModuleRef {
         }
     }
 
-    fn name(self: PyModuleRef, _vm: &VirtualMachine) -> String {
+    fn name(self, _vm: &VirtualMachine) -> String {
         self.name.clone()
     }
 }
 
 pub fn init(context: &PyContext) {
     extend_class!(&context, &context.module_type, {
         "__dir__" => context.new_rustfunc(PyModuleRef::dir),
-        "__name__" => context.new_rustfunc(PyModuleRef::name)
+        "__name__" => PropertyBuilder::new(context)
+                .add_getter(PyModuleRef::name)
+                .create(),
+        "__new__" => context.new_rustfunc(PyModuleRef::new),
     });
 }

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+use crate::obj::objproperty::PropertyBuilder;`
	`2`	`+use crate::obj::objstr::PyStringRef;`
`1`	`3`	`use crate::obj::objtype::PyClassRef;`
`2`	`4`	`use crate::pyobject::{PyContext, PyRef, PyResult, PyValue};`
`3`	`5`	`use crate::vm::VirtualMachine;`
`@@ -15,6 +17,12 @@ impl PyValue for PyModule {`
`15`	`17`	`}`
`16`	`18`
`17`	`19`	`impl PyModuleRef {`
	`20`	`+ fn new(cls: PyClassRef, name: PyStringRef, vm: &VirtualMachine) -> PyResult<PyModuleRef> {`
	`21`	`+ PyModule {`
	`22`	`+ name: name.as_str().to_string(),`
	`23`	`+ }`
	`24`	`+ .into_ref_with_type(vm, cls)`
	`25`	`+ }`
`18`	`26`	`fn dir(self: PyModuleRef, vm: &VirtualMachine) -> PyResult {`
`19`	`27`	`if let Some(dict) = &self.into_object().dict {`
`20`	`28`	`let keys = dict.into_iter().map(\|(k, _v)\| k.clone()).collect();`
`@@ -24,14 +32,17 @@ impl PyModuleRef {`
`24`	`32`	`}`
`25`	`33`	`}`
`26`	`34`
`27`		`- fn name(self: PyModuleRef, _vm: &VirtualMachine) -> String {`
	`35`	`+ fn name(self, _vm: &VirtualMachine) -> String {`
`28`	`36`	`self.name.clone()`
`29`	`37`	`}`
`30`	`38`	`}`
`31`	`39`
`32`	`40`	`pub fn init(context: &PyContext) {`
`33`	`41`	`extend_class!(&context, &context.module_type, {`
`34`	`42`	`"__dir__" => context.new_rustfunc(PyModuleRef::dir),`
`35`		`- "__name__" => context.new_rustfunc(PyModuleRef::name)`
	`43`	`+ "__name__" => PropertyBuilder::new(context)`
	`44`	`+ .add_getter(PyModuleRef::name)`
	`45`	`+ .create(),`
	`46`	`+ "__new__" => context.new_rustfunc(PyModuleRef::new),`
`36`	`47`	`});`
`37`	`48`	`}`