Reintroduce new_scope for the common case of an empty scope.

cthulahoops · cthulahoops · commit 6ad528c15c5c · 2019-03-10T12:38:43.000Z
diff --git a/src/main.rs b/src/main.rs
@@ -82,7 +82,7 @@ fn _run_string(vm: &mut VirtualMachine, source: &str, source_path: String) -> Py
         vm.new_exception(syntax_error, err.to_string())
     })?;
     // trace!("Code object: {:?}", code_obj.borrow());
-    let vars = Scope::new(None, vm.ctx.new_dict()); // Keep track of local variables
+    let vars = vm.ctx.new_scope(); // Keep track of local variables
     vm.run_code_obj(code_obj, vars)
 }
 
@@ -164,7 +164,7 @@ fn run_shell(vm: &mut VirtualMachine) -> PyResult {
         "Welcome to the magnificent Rust Python {} interpreter",
         crate_version!()
     );
-    let vars = Scope::new(None, vm.ctx.new_dict());
+    let vars = vm.ctx.new_scope();
 
     // Read a single line:
     let mut input = String::new();
diff --git a/vm/src/eval.rs b/vm/src/eval.rs
@@ -34,7 +34,7 @@ mod tests {
     fn test_print_42() {
         let source = String::from("print('Hello world')\n");
         let mut vm = VirtualMachine::new();
-        let vars = Scope::new(None, vm.ctx.new_dict());
+        let vars = vm.ctx.new_scope();
         let _result = eval(&mut vm, &source, vars, "<unittest>");
 
         // TODO: check result?
diff --git a/vm/src/pyobject.rs b/vm/src/pyobject.rs
@@ -593,6 +593,10 @@ impl PyContext {
         objtype::new(self.type_type(), name, vec![base], PyAttributes::new()).unwrap()
     }
 
+    pub fn new_scope(&self) -> Scope {
+        Scope::new(None, self.new_dict())
+    }
+
     pub fn new_module(&self, name: &str, dict: PyObjectRef) -> PyObjectRef {
         PyObject::new(
             PyObjectPayload::AnyRustValue {
diff --git a/wasm/lib/src/vm_class.rs b/wasm/lib/src/vm_class.rs
@@ -28,7 +28,7 @@ pub(crate) struct StoredVirtualMachine {
 impl StoredVirtualMachine {
     fn new(id: String, inject_browser_module: bool) -> StoredVirtualMachine {
         let mut vm = VirtualMachine::new();
-        let scope = Scope::new(None, vm.ctx.new_dict());
+        let scope = vm.ctx.new_scope();
         if inject_browser_module {
             setup_browser_module(&mut vm);
         }

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ pub(crate) struct StoredVirtualMachine {`
`28`	`28`	`impl StoredVirtualMachine {`
`29`	`29`	`fn new(id: String, inject_browser_module: bool) -> StoredVirtualMachine {`
`30`	`30`	`let mut vm = VirtualMachine::new();`
`31`		`- let scope = Scope::new(None, vm.ctx.new_dict());`
	`31`	`+ let scope = vm.ctx.new_scope();`
`32`	`32`	`if inject_browser_module {`
`33`	`33`	`setup_browser_module(&mut vm);`
`34`	`34`	`}`