update fixes vol 2

Cargo.toml

@@ -4,11 +4,12 @@ resolver = "2"
 
 package.authors = ["Dragoș Tiselice <[email protected]>"]
 package.edition = "2021"
-package.version = "0.1.0"
+package.version = "0.0.0-prealpha0"
 
 [workspace.dependencies]
-pest = { path = "./pest" }
-pest_meta = { path = "./meta" }
-pest_generator = { path = "./generator" }
+pest3 = { path = "./pest", package = "pest3" }
+pest3_meta = { path = "./meta", package = "pest3_meta" }
+pest3_generator = { path = "./generator", package = "pest3_generator" }
 unicode-width = { version = "0.1.11" }
-pest2 = { version = "2.7.6", package = "pest" }
+pest2 = { version = "2.7.8", package = "pest" }
+pest2_derive =  { version = "2.7.8", package = "pest_derive" }

derive/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "pest_derive"
+name = "pest3_derive"
 
 # authors = [] # List authors later :)
 version.workspace = true
@@ -11,8 +11,8 @@ edition.workspace = true
 proc-macro = true
 
 [dependencies]
-pest_generator.workspace = true
+pest3_generator.workspace = true
 
 [dev-dependencies]
-pest.workspace = true
+pest3.workspace = true
 anyhow = "1"

derive/examples/reader.rs

@@ -1,5 +1,5 @@
-use pest::typed::{PairTree, TypedNode as _};
-use pest_derive::Parser;
+use pest3::typed::{PairTree, TypedNode as _};
+use pest3_derive::Parser;
 use std::io::{stdin, BufRead};
 
 #[derive(Parser)]

derive/src/lib.rs

@@ -13,5 +13,5 @@ use proc_macro::TokenStream;
     )
 )]
 pub fn derive_typed_parser(input: TokenStream) -> TokenStream {
-    pest_generator::typed::derive_typed_parser(input.into(), true, true).into()
+    pest3_generator::typed::derive_typed_parser(input.into(), true, true).into()
 }

derive/tests/grammar.rs

@@ -11,11 +11,11 @@
 //! and modified.
 //! Overridden the macro [`parses_to`].
 
-use pest::{
+use pest3::{
     token::Pair,
     typed::{PairTree, TypedNode},
 };
-use pest_derive::Parser;
+use pest3_derive::Parser;
 
 #[derive(Parser)]
 #[grammar = "tests/grammar.pest"]

derive/tests/json.rs

@@ -4,7 +4,7 @@
 /// Grammar rules of a sample JSON parser
 #[allow(missing_docs)]
 pub mod json {
-    use pest_derive::Parser;
+    use pest3_derive::Parser;
 
     /// JSON parser.
     #[derive(Parser)]
@@ -14,7 +14,7 @@ pub mod json {
 
 #[cfg(test)]
 mod tests {
-    use pest::typed::{PairContainer, TypedParser};
+    use pest3::typed::{PairContainer, TypedParser};
 
     use crate::{json, json::generics::*};
     #[test]

derive/tests/sample.rs

@@ -1,7 +1,7 @@
 #![allow(unused_variables)]
 use anyhow::Result;
-use pest::typed::TypedNode as _;
-use pest_derive::Parser;
+use pest3::typed::TypedNode as _;
+use pest3_derive::Parser;
 
 #[derive(Parser)]
 #[grammar = "../meta/tests/pest3sample.pest"]

derive/tests/sequence.rs

@@ -1,5 +1,5 @@
-use pest::typed::TypedNode;
-use pest_derive::Parser;
+use pest3::typed::TypedNode;
+use pest3_derive::Parser;
 
 #[derive(Parser)]
 #[grammar_inline = r#"
@@ -22,7 +22,7 @@ macro_rules! test {
     ($name:ident, $input:literal, $($fields:tt)*) => {
         mod $name {
             use super::rules;
-            use pest::typed::TypedNode;
+            use pest3::typed::TypedNode;
 
             #[test]
             fn matched() -> anyhow::Result<()> {

derive/tests/skip.rs

@@ -1,7 +1,7 @@
 #![allow(unused_variables)]
 use anyhow::Result;
-use pest::typed::TypedNode as _;
-use pest_derive::Parser;
+use pest3::typed::TypedNode as _;
+use pest3_derive::Parser;
 
 #[derive(Parser)]
 #[grammar_inline = r#"

generator/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "pest_generator"
+name = "pest3_generator"
 version.workspace = true
 authors.workspace = true
 edition.workspace = true
@@ -8,8 +8,8 @@ edition.workspace = true
 proc-macro2 = "1.0"
 quote = "1.0"
 syn = "2.0"
-pest_meta.workspace = true
-pest.workspace = true
+pest3_meta.workspace = true
+pest3.workspace = true
 
 [dev-dependencies]
 lazy_static = { version = "1.4.0" }

generator/src/common.rs

@@ -1,6 +1,6 @@
 //! Some common codes that most backends will use.
 
-use pest_meta::{doc::DocComment, parser::ParseRule};
+use pest3_meta::{doc::DocComment, parser::ParseRule};
 use proc_macro2::{Ident, TokenStream};
 use quote::{format_ident, quote};
 use std::path::PathBuf;

generator/src/typed/generator.rs

@@ -10,7 +10,7 @@ use crate::{
     types::option_type,
     types::pest,
 };
-use pest_meta::{
+use pest3_meta::{
     doc::DocComment,
     error::rename_meta_rule,
     parser::{self, fmt_sep, ParseExpr, ParseNode, ParseRule, PathArgs, Range, Trivia},
@@ -620,7 +620,7 @@ pub fn derive_typed_parser(
 mod tests {
     use super::*;
     use lazy_static::lazy_static;
-    use pest_meta::{
+    use pest3_meta::{
         doc::DocComment,
         parser::{self, ParseRule},
     };

generator/src/typed/module.rs

@@ -2,8 +2,8 @@ use super::{
     generator::{ProcessedPathArgs, RuleRef},
     output::generics,
 };
-use pest::unicode::unicode_property_names;
-use pest_meta::parser::ParseRule;
+use pest3::unicode::unicode_property_names;
+use pest3_meta::parser::ParseRule;
 use proc_macro2::{Ident, TokenStream};
 use quote::{format_ident, quote};
 use std::{
@@ -232,6 +232,7 @@ impl<'g> ModuleSystem<'g> {
             ("stack", Rc::new(ModuleNode::Collection(pest_stack))),
             ("unicode", Rc::new(pest_unicode)),
         ]);
+        // FIXME: make "pest" paths to refer to pest3 crate for the moment
         let root = ModuleNode::Collection(HashMap::from([(
             "pest",
             Rc::new(ModuleNode::Collection(pest)),

generator/src/types.rs

@@ -3,7 +3,7 @@ use quote::quote;
 
 pub fn pest() -> TokenStream {
     quote! {
-        ::pest
+        ::pest3
     }
 }
 pub fn _str() -> TokenStream {