From 377795dbecf6e28a9515c8ce556cb865ebd1302f Mon Sep 17 00:00:00 2001
From: Windel Bouwman <windel@windel.nl>
Date: Sat, 7 Jul 2018 17:14:45 +0200
Subject: [PATCH] Shuffle files in proper places

---
 Cargo.toml                                                    | 2 +-
 {py_code_object => bytecode}/src/bytecode.rs                  | 0
 vm/test.py => demo2.py                                        | 0
 {vm => py_code_object}/init_env.sh                            | 0
 {vm => py_code_object}/python_compiler/Cargo.lock             | 0
 {vm => py_code_object}/python_compiler/Cargo.toml             | 0
 {vm => py_code_object}/python_compiler/examples/compile.rs    | 0
 {vm => py_code_object}/python_compiler/src/lib.rs             | 0
 {vm => py_code_object}/python_compiler/src/python_compiler.rs | 0
 {vm => py_code_object}/test.sh                                | 0
 vm/.gitignore                                                 | 4 ++--
 vm/{RustPython => }/Cargo.toml                                | 2 +-
 vm/{RustPython => }/src/builtins.rs                           | 0
 vm/{RustPython => }/src/lib.rs                                | 0
 vm/{RustPython => }/src/main.rs                               | 0
 15 files changed, 4 insertions(+), 4 deletions(-)
 rename {py_code_object => bytecode}/src/bytecode.rs (100%)
 rename vm/test.py => demo2.py (100%)
 rename {vm => py_code_object}/init_env.sh (100%)
 rename {vm => py_code_object}/python_compiler/Cargo.lock (100%)
 rename {vm => py_code_object}/python_compiler/Cargo.toml (100%)
 rename {vm => py_code_object}/python_compiler/examples/compile.rs (100%)
 rename {vm => py_code_object}/python_compiler/src/lib.rs (100%)
 rename {vm => py_code_object}/python_compiler/src/python_compiler.rs (100%)
 rename {vm => py_code_object}/test.sh (100%)
 rename vm/{RustPython => }/Cargo.toml (79%)
 rename vm/{RustPython => }/src/builtins.rs (100%)
 rename vm/{RustPython => }/src/lib.rs (100%)
 rename vm/{RustPython => }/src/main.rs (100%)

diff --git a/Cargo.toml b/Cargo.toml
index 88ca2923e..bd49a911f 100644
--- 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" }
diff --git a/py_code_object/src/bytecode.rs b/bytecode/src/bytecode.rs
similarity index 100%
rename from py_code_object/src/bytecode.rs
rename to bytecode/src/bytecode.rs
diff --git a/vm/test.py b/demo2.py
similarity index 100%
rename from vm/test.py
rename to demo2.py
diff --git a/vm/init_env.sh b/py_code_object/init_env.sh
similarity index 100%
rename from vm/init_env.sh
rename to py_code_object/init_env.sh
diff --git a/vm/python_compiler/Cargo.lock b/py_code_object/python_compiler/Cargo.lock
similarity index 100%
rename from vm/python_compiler/Cargo.lock
rename to py_code_object/python_compiler/Cargo.lock
diff --git a/vm/python_compiler/Cargo.toml b/py_code_object/python_compiler/Cargo.toml
similarity index 100%
rename from vm/python_compiler/Cargo.toml
rename to py_code_object/python_compiler/Cargo.toml
diff --git a/vm/python_compiler/examples/compile.rs b/py_code_object/python_compiler/examples/compile.rs
similarity index 100%
rename from vm/python_compiler/examples/compile.rs
rename to py_code_object/python_compiler/examples/compile.rs
diff --git a/vm/python_compiler/src/lib.rs b/py_code_object/python_compiler/src/lib.rs
similarity index 100%
rename from vm/python_compiler/src/lib.rs
rename to py_code_object/python_compiler/src/lib.rs
diff --git a/vm/python_compiler/src/python_compiler.rs b/py_code_object/python_compiler/src/python_compiler.rs
similarity index 100%
rename from vm/python_compiler/src/python_compiler.rs
rename to py_code_object/python_compiler/src/python_compiler.rs
diff --git a/vm/test.sh b/py_code_object/test.sh
similarity index 100%
rename from vm/test.sh
rename to py_code_object/test.sh
diff --git a/vm/.gitignore b/vm/.gitignore
index a91ccc591..4931874f7 100644
--- a/vm/.gitignore
+++ b/vm/.gitignore
@@ -1,5 +1,5 @@
 venv/
 tests/*.bytecode
-RustPython/Cargo.lock
-RustPython/target
+Cargo.lock
 python_compiler/target
+target/
diff --git a/vm/RustPython/Cargo.toml b/vm/Cargo.toml
similarity index 79%
rename from vm/RustPython/Cargo.toml
rename to vm/Cargo.toml
index 7448a35db..a8b9ecd4b 100644
--- a/vm/RustPython/Cargo.toml
+++ b/vm/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" }
diff --git a/vm/RustPython/src/builtins.rs b/vm/src/builtins.rs
similarity index 100%
rename from vm/RustPython/src/builtins.rs
rename to vm/src/builtins.rs
diff --git a/vm/RustPython/src/lib.rs b/vm/src/lib.rs
similarity index 100%
rename from vm/RustPython/src/lib.rs
rename to vm/src/lib.rs
diff --git a/vm/RustPython/src/main.rs b/vm/src/main.rs
similarity index 100%
rename from vm/RustPython/src/main.rs
rename to vm/src/main.rs