Cleaner separation between v0 and v1

Author: d-plaindoux

Cargo.toml

@@ -2,9 +2,9 @@
 resolver = "2"
 members = [
     "core",
-    "lang_v0",
-    "macro",
-    "lang_v1",
+    "lang/v0/parser",
+    "lang/v0/macro",
+    "lang/v1/parser",
     "extension"
 ]
 

extension/Cargo.toml

@@ -5,5 +5,5 @@ authors = ["d-plaindoux <[email protected]>"]
 edition = "2021"
 
 [dependencies]
-celma_core  = { version = "0.1.0", path = "../core" }
-celma_macro = { version = "0.1.0", path = "../macro" }
+celma_core = { version = "0.1.0", path = "../core" }
+celma_macro_v0 = { version = "0.1.0", path = "../lang/v0/macro" }

extension/src/genlex/parser.rs

@@ -30,7 +30,7 @@ where
     S: Stream<Item = char> + 'a,
 {
     use celma_core::parser::char::{alpha, digit, space};
-    use celma_macro::parsec_rules;
+    use celma_macro_v0::parsec_rules;
 
     fn mk_char(a: Vec<char>) -> char {
         *a.first().unwrap()

macro/Cargo.toml lang/v0/macro/Cargo.tomlmacro/Cargo.toml renamed to lang/v0/macro/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "celma_macro"
+name = "celma_macro_v0"
 version = "0.1.0"
 authors = ["d-plaindoux <[email protected]>"]
 edition = "2021"
@@ -8,8 +8,8 @@ edition = "2021"
 proc-macro = true
 
 [dependencies]
-celma_core = { version = "0.1.0", path = "../core" }
-celma_lang_v0 = { version = "0.1.0", path = "../lang_v0" }
+celma_core = { version = "0.1.0", path = "../../../core" }
+celma_lang_v0 = { version = "0.1.0", path = "../parser" }
 
 [dev-dependencies]
 bencher = "0.1.5"

macro/benches/data/apache_builds.json …v0/macro/benches/data/apache_builds.jsonmacro/benches/data/apache_builds.json renamed to lang/v0/macro/benches/data/apache_builds.json macro/benches/data/apache_builds.json renamed to lang/v0/macro/benches/data/apache_builds.json

@@ -28,7 +28,7 @@ use celma_core::parser::specs::Parse;
 use celma_core::stream::char_stream::CharStream;
 use celma_core::stream::position::Position;
 use celma_core::stream::specs::Stream;
-use celma_macro::parsec_rules;
+use celma_macro_v0::parsec_rules;
 
 #[derive(Clone)]
 pub enum JSON {

macro/benches/data/canada_nom.json …ng/v0/macro/benches/data/canada_nom.jsonmacro/benches/data/canada_nom.json renamed to lang/v0/macro/benches/data/canada_nom.json macro/benches/data/canada_nom.json renamed to lang/v0/macro/benches/data/canada_nom.json

@@ -20,8 +20,8 @@ use celma_core::parser::response::Response::{Reject, Success};
 use celma_core::parser::specs::Parse;
 use celma_core::stream::char_stream::CharStream;
 use celma_core::stream::specs::Stream;
-use celma_lang_v0::meta::parser::{celma_parsec, celma_parsec_rules};
-use celma_lang_v0::meta::transpiler::Transpile;
+use celma_lang_v0::parser::{celma_parsec, celma_parsec_rules};
+use celma_lang_v0::transpiler::Transpile;
 use proc_macro::TokenStream;
 
 #[proc_macro]