Reverse dependency between vm and cpython bytecode adapter

Author: windelbouwman

Cargo.lock

@@ -9,3 +9,4 @@ env_logger = "0.3"
 serde = "0.8.22"
 serde_derive = "0.8"
 serde_json = "0.8"
+rustpython_vm = {path = "../vm"}

py_code_object/Cargo.toml

@@ -2,8 +2,11 @@
  * Take an AST and transform it into bytecode
  */
 
-use super::ast;
-use super::bytecode::{self, CodeObject, Instruction};
+extern crate rustpython_parser;
+extern crate rustpython_vm;
+
+use rustpython_parser::ast;
+use rustpython_vm::bytecode::{self, CodeObject, Instruction};
 
 struct Compiler {
     code_object: CodeObject,

py_code_object/src/convert.rs

@@ -7,11 +7,12 @@ extern crate log;
 extern crate rustpython_parser;
 extern crate rustpython_vm;
 
-mod compile_py_code_object;
+// mod compile_py_code_object;
+mod compile;
 use clap::{Arg, App};
 use std::path::Path;
 use rustpython_parser::parse;
-use rustpython_vm::VirtualMachine;
+use rustpython_vm::evaluate;
 
 
 fn main() {
@@ -38,10 +39,9 @@ fn main() {
   match parse(filepath) {
     Ok(program) => {
       debug!("Got ast: {:?}", program);
-      let bytecode = compile_py_code_object::compile(program);
+      let bytecode = compile::compile(program);
       debug!("Code object: {:?}", bytecode);
-      let mut vm = VirtualMachine::new();
-      vm.run_code(bytecode);
+      evaluate(bytecode);
     },
     Err(msg) => error!("Parsing went horribly wrong: {}", msg),
   }

vm/src/main.rs py_code_object/src/main.rsvm/src/main.rs renamed to py_code_object/src/main.rs

@@ -6,7 +6,3 @@ authors = ["Shing Lyu <shing.lyu@gmail.com>"]
 [dependencies]
 log = "0.3"
 env_logger = "0.3"
-serde = "0.8.22"
-serde_derive = "0.8"
-serde_json = "0.8"
-py_code_object = { path = "../py_code_object" }

src/compile.rs

@@ -1,7 +1,11 @@
-use NativeType;
-use std::rc::Rc;
 use std::ops::Deref;
+use std::io::{self, Write};
 
+use super::pyobject::PyObjectRef;
+
+
+/*
+ * Original impl:
 pub fn print(args: Vec<Rc<NativeType>>) -> NativeType {
     for elem in args {
         // TODO: figure out how python's print vectors
@@ -32,7 +36,20 @@ pub fn print(args: Vec<Rc<NativeType>>) -> NativeType {
     }
     NativeType::NoneType
 }
+*/
+
+pub fn print(args: Vec<PyObjectRef>) {
+    // println!("Woot: {:?}", args);
+    trace!("print called with {:?}", args);
+    for a in args {
+        print!("{} ", a.borrow_mut().str());
+    }
+    println!();
+    io::stdout().flush().unwrap();
+}
 
+/*
+ * TODO
 pub fn len(args: Vec<Rc<NativeType>>) -> NativeType {
     if args.len() != 1 {
         panic!("len(s) expects exactly one parameter");
@@ -45,3 +62,12 @@ pub fn len(args: Vec<Rc<NativeType>>) -> NativeType {
     };
     NativeType::Int(len as i32)
 }
+*/
+
+pub fn fill_scope() {
+    // scope[String::from("print")] = print;
+}
+
+fn any() {}
+
+fn all() {}

src/main.rs

@@ -12,7 +12,7 @@ let call_function = 0x64;
  */
 use std::collections::HashMap;
 
-#[derive(Debug)]
+#[derive(Debug, Clone)]
 pub struct CodeObject {
     pub instructions: Vec<Instruction>,
     pub label_map: HashMap<Label, usize>,
@@ -29,7 +29,7 @@ impl CodeObject {
 
 pub type Label = usize;
 
-#[derive(Debug)]
+#[derive(Debug, Clone)]
 pub enum Instruction {
     LoadName { name: String },
     StoreName { name: String },
@@ -43,6 +43,7 @@ pub enum Instruction {
     Break,
     Jump { target: Label },
     JumpIf { target: Label },
+    MakeFunction { code: CodeObject },
     CallFunction { count: usize },
     ForIter,
     ReturnValue,
@@ -53,14 +54,14 @@ pub enum Instruction {
     BuildMap { size: usize },
 }
 
-#[derive(Debug)]
+#[derive(Debug, Clone)]
 pub enum Constant {
-    Integer { value: i32 },
+    Integer { value: i32 }, // TODO: replace by arbitrary big int math.
     // TODO: Float { value: f64 },
     String { value: String },
 }
 
-#[derive(Debug)]
+#[derive(Debug, Clone)]
 pub enum BinaryOperator {
     Power,
     Multiply,
@@ -77,7 +78,7 @@ pub enum BinaryOperator {
     Or,
 }
 
-#[derive(Debug)]
+#[derive(Debug, Clone)]
 pub enum UnaryOperator {
     Not,
     Minus,