Move bytecode into own crate.

Author: windelbouwman

Cargo.lock

@@ -1,11 +1,11 @@
 [package]
 name = "rustpython"
 version = "0.0.1"
-authors = ["Windel Bouwman", "Shing Lyu <shing.lyu@gmail.com>"]
+authors = ["Windel Bouwman <windel@windel.nl>", "Shing Lyu <shing.lyu@gmail.com>"]
 edition = "2018"
 
 [workspace]
-members = [".", "derive", "vm", "wasm/lib", "parser", "compiler"]
+members = [".", "derive", "vm", "wasm/lib", "parser", "compiler", "bytecode"]
 
 [[bench]]
 name = "bench"

Cargo.toml

@@ -0,0 +1,12 @@
+[package]
+name = "rustpython_bytecode"
+version = "0.1.0"
+authors = ["Windel Bouwman <windel@windel.nl>"]
+edition = "2018"
+
+[dependencies]
+bitflags = "1.1"
+num-bigint = { version = "0.2", features = ["serde"] }
+num-complex = { version = "0.2", features = ["serde"] }
+serde = { version = "1.0", features = ["derive"] }
+rustpython_parser = { path = "../parser" }

bytecode/Cargo.toml

@@ -0,0 +1 @@
+pub mod bytecode;

compiler/src/bytecode.rs bytecode/src/bytecode.rscompiler/src/bytecode.rs renamed to bytecode/src/bytecode.rs

@@ -1,11 +1,12 @@
 [package]
 name = "rustpython_compiler"
 version = "0.1.0"
-authors = ["coolreader18 <33094578+coolreader18@users.noreply.github.com>"]
+authors = ["coolreader18 <33094578+coolreader18@users.noreply.github.com>", "Windel Bouwman <windel@windel.nl>"]
 edition = "2018"
 
 [dependencies]
 bitflags = "1.1"
+rustpython_bytecode = { path = "../bytecode" }
 rustpython_parser = { path = "../parser" }
 serde = { version = "1.0", features = ["derive"] }
 num-complex = { version = "0.2", features = ["serde"] }

bytecode/src/lib.rs

@@ -5,10 +5,10 @@
 //!   https://github.com/python/cpython/blob/master/Python/compile.c
 //!   https://github.com/micropython/micropython/blob/master/py/compile.c
 
-use crate::bytecode::{self, CallType, CodeObject, Instruction, Varargs};
 use crate::error::{CompileError, CompileErrorType};
 use crate::symboltable::{make_symbol_table, statements_to_symbol_table, SymbolRole, SymbolScope};
 use num_complex::Complex64;
+use rustpython_bytecode::bytecode::{self, CallType, CodeObject, Instruction, Varargs};
 use rustpython_parser::{ast, parser};
 
 struct Compiler {

compiler/Cargo.toml

@@ -4,7 +4,6 @@
 #[macro_use]
 extern crate log;
 
-pub mod bytecode;
 pub mod compile;
 pub mod error;
 mod symboltable;

compiler/src/compile.rs

@@ -12,5 +12,6 @@ syn = { version = "0.15.29", features = ["full"] }
 quote = "0.6.11"
 proc-macro2 = "0.4.27"
 rustpython_compiler = { path = "../compiler" }
+rustpython_bytecode = { path = "../bytecode" }
 bincode =  "1.1"
 proc-macro-hack = "0.5"

compiler/src/lib.rs

@@ -17,7 +17,8 @@ use crate::{extract_spans, Diagnostic};
 use bincode;
 use proc_macro2::{Span, TokenStream as TokenStream2};
 use quote::quote;
-use rustpython_compiler::{bytecode::CodeObject, compile};
+use rustpython_bytecode::bytecode::CodeObject;
+use rustpython_compiler::compile;
 use std::env;
 use std::fs;
 use std::path::PathBuf;