refactor: ♻️ reorganize Cargo.toml dependencies, enhance Context struct with clone_source and call path management

Author: enklht

Cargo.toml

@@ -4,6 +4,8 @@ version = "0.1.0"
 edition = "2024"
 
 [dependencies]
-env_logger = "0.11.8"
 log = "0.4.29"
 rustc-hash = "2.1.1"
+
+[dev-dependencies]
+env_logger = "0.11.8"

examples/baab_baab.rs

@@ -5,11 +5,12 @@
 use packrust::*;
 
 fn main() {
+    env_logger::init();
+
     // S -> A '-' A
     // A -> B 'b' / 'b'
     // B -> B 'a' / A 'a'
-
-    let parser = {
+    let s = {
         let a = lazy("A", |a| {
             let b = {
                 let a = a.clone();
@@ -25,6 +26,6 @@ fn main() {
     .end()
     .map(|_| "parse success");
 
-    let res = parser.run("baab-baab");
+    let res = s.run("baab-baab");
     println!("{:?}", res);
 }

src/combinators.rs

@@ -31,7 +31,7 @@ where
             let (pos, val) = (self.raw_parser)(pos, ctx)?;
             let Some(val) = f(val) else {
                 return Err(ParseError {
-                    source: ctx.source.iter().collect(),
+                    source: ctx.clone_source(),
                     pos,
                     reason: String::from("try map failed: got None"),
                 });
@@ -110,7 +110,7 @@ where
             let (pos, val) = self.parse(pos, ctx)?;
             match ctx.source.get(pos) {
                 Some(c) => Err(ParseError {
-                    source: ctx.source.iter().collect(),
+                    source: ctx.clone_source(),
                     pos,
                     reason: format!("expected EOF found {}", c),
                 }),
@@ -129,12 +129,12 @@ pub fn satisfy(name: impl Into<String>, f: impl Fn(char) -> bool + 'static) -> P
         Rc::new(move |pos, ctx: &mut Context| match ctx.source.get(pos) {
             Some(&c) if f(c) => Ok((pos + 1, c)),
             Some(c) => Err(ParseError {
-                source: ctx.source.iter().collect(),
+                source: ctx.clone_source(),
                 pos,
                 reason: format!("expected {} got {}", name, c),
             }),
             None => Err(ParseError {
-                source: ctx.source.iter().collect(),
+                source: ctx.clone_source(),
                 pos,
                 reason: format!("expected {} got EOF", name),
             }),
@@ -166,7 +166,7 @@ pub fn keyword(keyword: impl Into<String>) -> Parser<String> {
                 Ok((pos + keyword.len(), name.clone()))
             } else {
                 Err(ParseError {
-                    source: ctx.source.iter().collect(),
+                    source: ctx.clone_source(),
                     pos,
                     reason: String::from(""),
                 })

src/context.rs

@@ -7,8 +7,8 @@ pub struct Context {
     pub cache: FxHashMap<CacheKey, Box<dyn Any>>,
     pub source: Vec<char>,
     pub lr_stack: Vec<CacheKey>,
-    pub call_path: Vec<CacheKey>,
-    pub pending_evictions: FxHashMap<CacheKey, Vec<CacheKey>>,
+    call_path: Vec<CacheKey>,
+    pending_evictions: FxHashMap<CacheKey, Vec<CacheKey>>,
 }
 
 impl Context {
@@ -22,6 +22,19 @@ impl Context {
         }
     }
 
+    pub(crate) fn clone_source(&self) -> String {
+        self.source.iter().collect()
+    }
+
+    pub(crate) fn push_call_path(&mut self, key: CacheKey) {
+        self.call_path.push(key);
+    }
+
+    pub(crate) fn pop_call_path(&mut self, key: CacheKey) {
+        debug_assert_eq!(self.call_path.last(), Some(&key));
+        self.call_path.pop();
+    }
+
     pub(crate) fn schedule_cache_eviction(&mut self, key: CacheKey) {
         let dependents = self.pending_evictions.entry(key).or_default();
 

src/lib.rs

@@ -73,7 +73,7 @@ where
                     ctx.schedule_cache_eviction(key);
 
                     return Err(ParseError {
-                        source: ctx.source.iter().collect(),
+                        source: ctx.clone_source(),
                         pos,
                         reason: String::from("failed to resolve left recursion"),
                     });
@@ -86,7 +86,7 @@ where
 
         ctx.cache
             .insert(key, Box::new(CacheEntry::<T>::LeftRecursion));
-        ctx.call_path.push(key);
+        ctx.push_call_path(key);
 
         let mut result = (self.raw_parser)(pos, ctx);
 
@@ -101,8 +101,7 @@ where
             let mut best_res @ Ok((mut best_pos, _)) = result else {
                 let popped = ctx.lr_stack.pop();
                 debug_assert_eq!(popped, Some(key));
-                let popped = ctx.call_path.pop();
-                debug_assert_eq!(popped, Some(key));
+                ctx.pop_call_path(key);
                 return result;
             };
 
@@ -130,8 +129,7 @@ where
             result = best_res
         }
 
-        let popped = ctx.call_path.pop();
-        debug_assert_eq!(popped, Some(key));
+        ctx.pop_call_path(key);
         result
     }