Shuffle files in proper places

2018-07-07 17:14:45 +02:00
parent 9526f78d82
commit 377795dbec
15 changed files with 4 additions and 4 deletions
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -8,5 +8,5 @@ log="0.4.1"
 env_logger="0.5.10"
 clap = "2.31.2"
 rustpython_parser = {path = "parser"}
-rustpython_vm = {path = "vm/RustPython"}
+rustpython_vm = {path = "vm"}
 py_code_object = { path = "py_code_object" }
--- a/py_code_object/src/bytecode.rs
+++ b/py_code_object/src/bytecode.rs
--- a/vm/test.py
+++ b/vm/test.py
--- a/py_code_object/init_env.sh
+++ b/py_code_object/init_env.sh
--- a/py_code_object/python_compiler/Cargo.lock
+++ b/py_code_object/python_compiler/Cargo.lock
--- a/py_code_object/python_compiler/Cargo.toml
+++ b/py_code_object/python_compiler/Cargo.toml
--- a/py_code_object/python_compiler/examples/compile.rs
+++ b/py_code_object/python_compiler/examples/compile.rs
--- a/py_code_object/python_compiler/src/lib.rs
+++ b/py_code_object/python_compiler/src/lib.rs
--- a/py_code_object/python_compiler/src/python_compiler.rs
+++ b/py_code_object/python_compiler/src/python_compiler.rs
--- a/py_code_object/test.sh
+++ b/py_code_object/test.sh
--- a/vm/.gitignore
+++ b/vm/.gitignore
@@ -1,5 +1,5 @@
 venv/
 tests/*.bytecode
-RustPython/Cargo.lock
-RustPython/target
+Cargo.lock
 python_compiler/target
+target/
--- a/vm/RustPython/Cargo.toml
+++ b/vm/RustPython/Cargo.toml
@@ -9,4 +9,4 @@ env_logger = "0.3"
 serde = "0.8.22"
 serde_derive = "0.8"
 serde_json = "0.8"
-py_code_object = { path = "../../py_code_object" }
+py_code_object = { path = "../py_code_object" }
--- a/vm/RustPython/src/builtins.rs
+++ b/vm/RustPython/src/builtins.rs
--- a/vm/RustPython/src/lib.rs
+++ b/vm/RustPython/src/lib.rs
--- a/vm/RustPython/src/main.rs
+++ b/vm/RustPython/src/main.rs