Remove executor trait since we can have mutual includes

Author: windelbouwman

src/main.rs

@@ -9,7 +9,7 @@ extern crate rustpython_vm;
 
 use clap::{App, Arg};
 use rustpython_parser::parser;
-use rustpython_vm::{VirtualMachine, Executor};
+use rustpython_vm::VirtualMachine;
 use rustpython_vm::compile;
 use rustpython_vm::eval::eval;
 use std::io;

vm/src/builtins.rs

@@ -4,11 +4,12 @@ use std::io::{self, Write};
 
 use super::compile;
 use super::pyobject::DictProtocol;
-use super::pyobject::{Executor, PyContext, PyObject, PyObjectKind, PyObjectRef, PyResult, Scope, IdProtocol};
+use super::pyobject::{PyContext, PyObject, PyObjectKind, PyObjectRef, PyResult, Scope, IdProtocol};
+use super::vm::VirtualMachine;
 use super::objbool;
 
 
-fn get_locals(rt: &mut Executor) -> PyObjectRef {
+fn get_locals(rt: &mut VirtualMachine) -> PyObjectRef {
     let mut d = rt.new_dict();
     // TODO: implement dict_iter_items?
     let locals = rt.get_locals();
@@ -23,16 +24,16 @@ fn get_locals(rt: &mut Executor) -> PyObjectRef {
     d
 }
 
-fn dir_locals(rt: &mut Executor) -> PyObjectRef {
+fn dir_locals(rt: &mut VirtualMachine) -> PyObjectRef {
     get_locals(rt)
 }
 
-fn dir_object(rt: &mut Executor, obj: PyObjectRef) -> PyObjectRef {
+fn dir_object(rt: &mut VirtualMachine, obj: PyObjectRef) -> PyObjectRef {
     let d = rt.new_dict();
     d
 }
 
-pub fn builtin_dir(rt: &mut Executor, args: Vec<PyObjectRef>) -> PyResult {
+pub fn builtin_dir(rt: &mut VirtualMachine, args: Vec<PyObjectRef>) -> PyResult {
     if args.is_empty() {
         Ok(dir_locals(rt))
     } else {
@@ -41,15 +42,15 @@ pub fn builtin_dir(rt: &mut Executor, args: Vec<PyObjectRef>) -> PyResult {
     }
 }
 
-pub fn builtin_id(rt: &mut Executor, args: Vec<PyObjectRef>) -> PyResult {
+pub fn builtin_id(rt: &mut VirtualMachine, args: Vec<PyObjectRef>) -> PyResult {
     if args.len() != 1 {
         return Err(rt.new_exception("Expected only one argument".to_string()))
     }
 
     Ok(rt.context().new_int(args[0].get_id() as i32))
 }
 
-pub fn builtin_print(rt: &mut Executor, args: Vec<PyObjectRef>) -> PyResult {
+pub fn builtin_print(rt: &mut VirtualMachine, args: Vec<PyObjectRef>) -> PyResult {
     trace!("print called with {:?}", args);
     for a in args {
         print!("{} ", a.borrow().str());
@@ -59,7 +60,7 @@ pub fn builtin_print(rt: &mut Executor, args: Vec<PyObjectRef>) -> PyResult {
     Ok(rt.get_none())
 }
 
-pub fn builtin_compile(rt: &mut Executor, args: Vec<PyObjectRef>) -> PyResult {
+pub fn builtin_compile(rt: &mut VirtualMachine, args: Vec<PyObjectRef>) -> PyResult {
     if args.len() < 1 {
         return Err(rt.new_exception("Expected more arguments".to_string()))
     }
@@ -73,11 +74,36 @@ pub fn builtin_compile(rt: &mut Executor, args: Vec<PyObjectRef>) -> PyResult {
     }
 }
 
-pub fn locals(rt: &mut Executor, args: Vec<PyObjectRef>) -> PyResult {
+pub fn builtin_eval(rt: &mut VirtualMachine, args: Vec<PyObjectRef>) -> PyResult {
+    if args.len() > 3 {
+        return Err(rt.new_exception("Expected at maximum of 3 arguments".to_string()))
+    } else if args.len() > 2 {
+        // TODO: handle optional global and locals
+    } else {
+        return Err(rt.new_exception("Expected at least one argument".to_string()))
+    }
+    let source = args[0].clone();
+    let _globals = args[1].clone();
+    let locals = args[2].clone();
+
+    let code_obj = source; // if source.borrow().kind 
+
+    // Construct new scope:
+    let scope_inner = Scope {
+        locals: locals,
+        parent: None,
+    };
+    let scope = PyObject { kind: PyObjectKind::Scope { scope: scope_inner }, typ: None }.into_ref();
+
+    // Run the source:
+    rt.run_code_obj(code_obj, scope)
+}
+
+pub fn locals(rt: &mut VirtualMachine, args: Vec<PyObjectRef>) -> PyResult {
     Ok(rt.get_locals())
 }
 
-pub fn len(rt: &mut Executor, args: Vec<PyObjectRef>) -> PyResult {
+pub fn len(rt: &mut VirtualMachine, args: Vec<PyObjectRef>) -> PyResult {
     if args.len() != 1 {
         panic!("len(s) expects exactly one parameter");
     }
@@ -105,6 +131,7 @@ pub fn make_module(ctx: &PyContext) -> PyObjectRef {
     dict.insert(String::from("dir"), ctx.new_rustfunc(builtin_dir));
     dict.insert(String::from("locals"), ctx.new_rustfunc(locals));
     dict.insert(String::from("compile"), ctx.new_rustfunc(builtin_compile));
+    dict.insert(String::from("eval"), ctx.new_rustfunc(builtin_eval));
     dict.insert("len".to_string(), ctx.new_rustfunc(len));
     let d2 = PyObject::new(PyObjectKind::Dict { elements: dict }, ctx.type_type.clone());
     let scope = PyObject::new(PyObjectKind::Scope { scope: Scope { locals: d2, parent: None} }, ctx.type_type.clone());
@@ -118,10 +145,10 @@ pub fn make_module(ctx: &PyContext) -> PyObjectRef {
     obj
 }
 
-fn builtin_any(rt: &mut Executor, args: Vec<PyObjectRef>) -> PyResult {
+fn builtin_any(rt: &mut VirtualMachine, args: Vec<PyObjectRef>) -> PyResult {
     Ok(rt.new_bool(args.into_iter().any(|e| objbool::boolval(e))))
 }
 
-fn builtin_all(rt: &mut Executor, args: Vec<PyObjectRef>) -> PyResult {
+fn builtin_all(rt: &mut VirtualMachine, args: Vec<PyObjectRef>) -> PyResult {
     Ok(rt.new_bool(args.into_iter().all(|e| objbool::boolval(e))))
 }

vm/src/compile.rs

@@ -6,14 +6,15 @@ extern crate rustpython_parser;
 
 use self::rustpython_parser::{ast, parser};
 use super::bytecode::{self, CodeObject, Instruction};
-use super::pyobject::{Executor, PyObject, PyObjectKind, PyObjectRef};
+use super::pyobject::{PyObject, PyObjectKind, PyObjectRef};
+use super::vm::VirtualMachine;
 
 struct Compiler {
     code_object_stack: Vec<CodeObject>,
     nxt_label: usize,
 }
 
-pub fn compile(rt: &mut Executor, source: &String, mode: Mode) -> Result<PyObjectRef, String> {
+pub fn compile(rt: &mut VirtualMachine, source: &String, mode: Mode) -> Result<PyObjectRef, String> {
     let mut compiler = Compiler::new();
     compiler.push_code_object(CodeObject::new(Vec::new()));
     match mode {

vm/src/eval.rs

@@ -1,7 +1,7 @@
 extern crate rustpython_parser;
 
 use super::compile;
-use super::pyobject::{Executor, PyObjectRef, PyResult};
+use super::pyobject::{PyObjectRef, PyResult};
 use super::vm::VirtualMachine;
 
 pub fn eval(vm: &mut VirtualMachine, source: &String, scope: PyObjectRef) -> PyResult {
@@ -18,7 +18,6 @@ pub fn eval(vm: &mut VirtualMachine, source: &String, scope: PyObjectRef) -> PyR
 
 #[cfg(test)]
 mod tests {
-    use super::Executor;
     use super::VirtualMachine;
     use super::eval;
 

vm/src/import.rs

@@ -10,7 +10,7 @@ use std::io::ErrorKind::NotFound;
 
 use self::rustpython_parser::parser;
 use super::compile;
-use super::pyobject::{Executor, PyObject, PyObjectKind, PyResult};
+use super::pyobject::{PyObject, PyObjectKind, PyResult};
 use super::vm::VirtualMachine;
 
 pub fn import(vm: &mut VirtualMachine, name: &String) -> PyResult {

vm/src/lib.rs

@@ -22,5 +22,5 @@ pub mod pyobject;
 mod sysmodule;
 mod vm;
 
-pub use self::pyobject::Executor;
+// pub use self::pyobject::Executor;
 pub use self::vm::VirtualMachine;

vm/src/objdict.rs

@@ -1,6 +1,7 @@
-use super::pyobject::{Executor, PyObjectRef, PyResult};
+use super::pyobject::{PyObjectRef, PyResult};
+use super::vm::VirtualMachine;
 
-pub fn set_item(rt: &mut Executor, d: PyObjectRef, idx: PyObjectRef, obj: PyObjectRef) -> PyResult {
+pub fn set_item(rt: &mut VirtualMachine, d: PyObjectRef, idx: PyObjectRef, obj: PyObjectRef) -> PyResult {
     Ok(rt.get_none())
 }
 

vm/src/objint.rs

@@ -1,7 +1,8 @@
-use super::pyobject::{Executor, PyObject, PyObjectKind, PyObjectRef};
+use super::pyobject::{PyObject, PyObjectKind, PyObjectRef};
+use super::vm::VirtualMachine;
 use std::collections::HashMap;
 
-fn str(rt: &mut Executor, args: Vec<PyObjectRef>) -> Result<PyObjectRef, PyObjectRef> {
+fn str(rt: &mut VirtualMachine, args: Vec<PyObjectRef>) -> Result<PyObjectRef, PyObjectRef> {
     Ok(rt.new_str("todo".to_string()))
 }
 

vm/src/objlist.rs

@@ -1,4 +1,5 @@
-use super::pyobject::{Executor, PyObject, PyObjectKind, PyObjectRef, PyResult};
+use super::pyobject::{PyObject, PyObjectKind, PyObjectRef, PyResult};
+use super::vm::VirtualMachine;
 
 fn get_pos(l: &Vec<PyObjectRef>, p: i32) -> usize {
     if p < 0 {
@@ -8,7 +9,7 @@ fn get_pos(l: &Vec<PyObjectRef>, p: i32) -> usize {
     }
 }
 
-pub fn get_item(rt: &mut Executor, l: &Vec<PyObjectRef>, b: PyObjectRef) -> PyResult {
+pub fn get_item(rt: &mut VirtualMachine, l: &Vec<PyObjectRef>, b: PyObjectRef) -> PyResult {
     match &(b.borrow()).kind {
         PyObjectKind::Integer { value } => {
             let pos_index = get_pos(l, *value);
@@ -51,7 +52,7 @@ pub fn get_item(rt: &mut Executor, l: &Vec<PyObjectRef>, b: PyObjectRef) -> PyRe
 
 // set_item:
 pub fn set_item(
-    rt: &mut Executor,
+    rt: &mut VirtualMachine,
     l: &mut Vec<PyObjectRef>,
     idx: PyObjectRef,
     obj: PyObjectRef,
@@ -69,7 +70,7 @@ pub fn set_item(
     }
 }
 
-pub fn append(rt: &mut Executor, l: PyObjectRef, other: PyObjectRef) -> PyResult {
+pub fn append(rt: &mut VirtualMachine, l: PyObjectRef, other: PyObjectRef) -> PyResult {
     Ok(rt.get_none())
 }
 

vm/src/objstr.rs

@@ -1,4 +1,5 @@
-use super::pyobject::{Executor, PyObjectKind, PyObjectRef, PyResult};
+use super::pyobject::{PyObjectKind, PyObjectRef, PyResult};
+use super::vm::VirtualMachine;
 
 fn str_pos(s: &String, p: i32) -> usize {
     if p < 0 {
@@ -10,7 +11,7 @@ fn str_pos(s: &String, p: i32) -> usize {
     }
 }
 
-pub fn subscript(rt: &mut Executor, value: &String, b: PyObjectRef) -> PyResult {
+pub fn subscript(rt: &mut VirtualMachine, value: &String, b: PyObjectRef) -> PyResult {
     // let value = a
     match &(*b.borrow()).kind {
         &PyObjectKind::Integer { value: ref pos } => {