Merge pull request #599 from palaviv/Fix-locals

windelbouwman · web-flow · commit 81a85cc0bf76 · 2019-03-05T07:23:46.000+01:00
Fix locals
diff --git a/tests/snippets/builtin_locals.py b/tests/snippets/builtin_locals.py
@@ -0,0 +1,19 @@
+
+a = 5
+b = 6
+
+loc = locals()
+
+assert loc['a'] == 5
+assert loc['b'] == 6
+
+def f():
+	c = 4
+	a = 7
+
+	loc = locals()
+
+	assert loc['a'] == 4
+	assert loc['c'] == 7
+	assert not 'b' in loc
+
diff --git a/vm/src/vm.rs b/vm/src/vm.rs
@@ -208,16 +208,8 @@ impl VirtualMachine {
     }
 
     pub fn get_locals(&self) -> PyObjectRef {
-        // let scope = &self.frames.last().unwrap().locals;
-        // scope.clone()
-        // TODO: fix this!
-        self.get_none()
-        /*
-        match (*scope).payload {
-            PyObjectPayload::Scope { scope } => { scope.locals.clone() },
-            _ => { panic!("Should be scope") },
-        } // .clone()
-        */
+        let scope = self.current_scope();
+        scope.locals.clone()
     }
 
     pub fn context(&self) -> &PyContext {
