minor revision

Author: d-plaindoux

Cargo.toml

@@ -7,6 +7,7 @@ members = [
     "lang/v0/macro",
     "lang/v1/ast",
     "lang/v1/parser",
+    "lang/v1/normalizer",
     "genlex"
 ]
 

genlex/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "celma_extension"
+name = "celma_genlex"
 version = "0.1.0"
 authors = ["d-plaindoux <[email protected]>"]
 edition = "2024"

lang/v0/core/src/parser/literal.rs

@@ -63,7 +63,7 @@ where
     }
 }
 
-pub fn string(s: &str) -> Chars {
+pub fn string<'a>(s: &'a str) -> Chars<'a> {
     Chars(s)
 }
 

lang/v0/macro/benches/json.rs

@@ -59,7 +59,7 @@ fn mk_f64(a: Vec<char>) -> f64 {
 }
 
 parsec_rules!(
-    let json:{JSON}          = S _=(string | number | boolean | null | array | object ) S
+    let json:{JSON}          = S _=(string | number | boolean | null | array | object) S
     let number:{JSON}        = f=NUMBER                                -> {JSON::Number(f)}
     let string:{JSON}        = s=STRING                                -> {JSON::String(s)}
     let null:{JSON}          = "null"                                  -> {JSON::Null}

lang/v1/normalizer/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "celma_v1"
+name = "celma_v1_normalizer"
 version = "0.1.0"
 authors = ["dplaindoux <[email protected]>"]
 edition = "2024"

lang/v1/normalizer/src/ast.rs

@@ -15,7 +15,7 @@
  */
 
 #[derive(Clone, Debug, Eq, PartialEq)]
-pub enum ASTGrammar<A> {
+pub enum AST<A> {
     Epsilon(),
     Bottom(),
     Var(String),
@@ -32,7 +32,6 @@ pub enum ASTGrammar<A> {
 
 /*
    PN : ASTParsec -> (string -> ASTParsec) -> string list -> ASTGrammar
-   PN : ASTParsec -> (string -> ASTParsec) -> string list -> ASTGrammar
 
    PN[PIdent(n)]gl          = Var(n)               if n in l
                             | mu(n,PN[g(n)]g(n::l) otherwise

lang/v1/parser/Cargo.toml

@@ -6,6 +6,5 @@ edition = "2024"
 
 [dependencies]
 celma_v0_core = { version = "0.1.0", path = "../../v0/core" }
-celma_v0_ast = { version = "0.1.0", path = "../../v0/ast" }
 celma_v0_macro = { version = "0.1.0", path = "../../v0/macro" }
 celma_v1_ast = { version = "0.1.0", path = "../ast" }