Move Scope from pyobject to frame.

cthulahoops · cthulahoops · commit 9d6e9ac8896e · 2019-03-01T20:49:17.000Z
diff --git a/src/main.rs b/src/main.rs
@@ -12,10 +12,11 @@ use rustpython_parser::error::ParseError;
 use rustpython_vm::{
     compile,
     error::CompileError,
+    frame::ScopeRef,
     import,
     obj::objstr,
     print_exception,
-    pyobject::{AttributeProtocol, PyResult, ScopeRef},
+    pyobject::{AttributeProtocol, PyResult},
     util, VirtualMachine,
 };
 use rustyline::{error::ReadlineError, Editor};
diff --git a/vm/src/builtins.rs b/vm/src/builtins.rs
@@ -14,9 +14,9 @@ use crate::obj::objiter;
 use crate::obj::objstr;
 use crate::obj::objtype;
 
+use crate::frame::{Scope, ScopeRef};
 use crate::pyobject::{
-    AttributeProtocol, IdProtocol, PyContext, PyFuncArgs, PyObjectRef, PyResult, Scope, ScopeRef,
-    TypeProtocol,
+    AttributeProtocol, IdProtocol, PyContext, PyFuncArgs, PyObjectRef, PyResult, TypeProtocol,
 };
 use std::rc::Rc;
 
diff --git a/vm/src/eval.rs b/vm/src/eval.rs
@@ -3,7 +3,8 @@ extern crate rustpython_parser;
 use std::error::Error;
 
 use crate::compile;
-use crate::pyobject::{PyResult, ScopeRef};
+use crate::frame::ScopeRef;
+use crate::pyobject::PyResult;
 use crate::vm::VirtualMachine;
 
 pub fn eval(vm: &mut VirtualMachine, source: &str, scope: ScopeRef, source_path: &str) -> PyResult {
diff --git a/vm/src/frame.rs b/vm/src/frame.rs
@@ -17,10 +17,23 @@ use crate::obj::objstr;
 use crate::obj::objtype;
 use crate::pyobject::{
     DictProtocol, IdProtocol, PyFuncArgs, PyObject, PyObjectPayload, PyObjectRef, PyResult,
-    ScopeRef, TypeProtocol,
+    TypeProtocol,
 };
 use crate::vm::VirtualMachine;
 use num_bigint::BigInt;
+use std::rc::Rc;
+
+/*
+ * So a scope is a linked list of scopes.
+ * When a name is looked up, it is check in its scope.
+ */
+#[derive(Debug)]
+pub struct Scope {
+    pub locals: PyObjectRef, // Variables
+    // TODO: pub locals: RefCell<PyAttributes>,         // Variables
+    pub parent: Option<Rc<Scope>>, // Parent scope
+}
+pub type ScopeRef = Rc<Scope>;
 
 #[derive(Clone, Debug)]
 struct Block {
diff --git a/vm/src/lib.rs b/vm/src/lib.rs
@@ -37,7 +37,7 @@ pub mod error;
 pub mod eval;
 mod exceptions;
 pub mod format;
-mod frame;
+pub mod frame;
 pub mod import;
 pub mod obj;
 pub mod pyobject;
diff --git a/vm/src/pyobject.rs b/vm/src/pyobject.rs
@@ -1,6 +1,6 @@
 use crate::bytecode;
 use crate::exceptions;
-use crate::frame::Frame;
+use crate::frame::{Frame, Scope, ScopeRef};
 use crate::obj::objbool;
 use crate::obj::objbytearray;
 use crate::obj::objbytes;
@@ -147,18 +147,6 @@ pub struct PyContext {
     pub exceptions: exceptions::ExceptionZoo,
 }
 
-/*
- * So a scope is a linked list of scopes.
- * When a name is looked up, it is check in its scope.
- */
-#[derive(Debug)]
-pub struct Scope {
-    pub locals: PyObjectRef, // Variables
-    // TODO: pub locals: RefCell<PyAttributes>,         // Variables
-    pub parent: Option<Rc<Scope>>, // Parent scope
-}
-pub type ScopeRef = Rc<Scope>;
-
 fn _nothing() -> PyObjectRef {
     PyObject {
         payload: PyObjectPayload::None,
diff --git a/vm/src/vm.rs b/vm/src/vm.rs
@@ -14,6 +14,7 @@ use std::sync::{Mutex, MutexGuard};
 use crate::builtins;
 use crate::bytecode;
 use crate::frame::ExecutionResult;
+use crate::frame::{Scope, ScopeRef};
 use crate::obj::objbool;
 use crate::obj::objcode;
 use crate::obj::objframe;
@@ -24,7 +25,7 @@ use crate::obj::objstr;
 use crate::obj::objtype;
 use crate::pyobject::{
     AttributeProtocol, DictProtocol, IdProtocol, PyContext, PyFuncArgs, PyObjectPayload,
-    PyObjectRef, PyResult, Scope, ScopeRef, TypeProtocol,
+    PyObjectRef, PyResult, TypeProtocol,
 };
 use crate::stdlib;
 use crate::sysmodule;
diff --git a/wasm/lib/src/vm_class.rs b/wasm/lib/src/vm_class.rs
@@ -4,7 +4,8 @@ use crate::wasm_builtins;
 use js_sys::{Object, SyntaxError, TypeError};
 use rustpython_vm::{
     compile,
-    pyobject::{DictProtocol, PyContext, PyFuncArgs, PyObjectRef, PyResult, ScopeRef},
+    frame::ScopeRef,
+    pyobject::{DictProtocol, PyContext, PyFuncArgs, PyObjectRef, PyResult},
     VirtualMachine,
 };
 use std::cell::RefCell;
