refactor: improve parser and parse trace visualizations

umut-sahin · Sep 9, 2024 · 24a879c · 24a879c
1 parent 8d5d3f8
commit 24a879c
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/assets/docs/demo.png b/assets/docs/demo.png
diff --git a/src/parser.rs b/src/parser.rs
@@ -281,7 +281,22 @@ impl Parser {
             let mut pretty_grammar = Table::new();
 
             pretty_grammar.add_row(row![cbFy->"Grammar"]);
-            pretty_grammar.add_row(row![self.grammar]);
+            {
+                let mut pretty_rules = Table::new();
+                pretty_rules.set_format(*prettytable::format::consts::FORMAT_CLEAN);
+
+                for (rule_index, rule) in self.grammar.rules().iter().enumerate() {
+                    pretty_rules.add_row(row![r->format!("{})", rule_index + 1), rule]);
+                }
+                if !self.grammar.regular_expressions().is_empty() {
+                    pretty_rules.add_row(row![r->"", ""]);
+                }
+                for (regex_token, regex) in self.grammar.regular_expressions().iter() {
+                    pretty_rules.add_row(row![r->"", format!("{} -> /{}/", regex_token, regex)]);
+                }
+
+                pretty_grammar.add_row(row![pretty_rules]);
+            }
 
             pretty_grammar.printstd();
         }

diff --git a/src/trace.rs b/src/trace.rs
@@ -93,10 +93,10 @@ impl<'i> Trace<'i> {
                     format!("Shift {}", next_state)
                 },
                 Action::Reduce { rule_index } => {
-                    format!("Reduce {} ({})", rule_index, grammar.rules()[rule_index])
+                    format!("Reduce {} ({})", rule_index + 1, grammar.rules()[rule_index])
                 },
                 Action::Accept { rule_index } => {
-                    format!("Accept {} ({})", rule_index, grammar.rules()[rule_index])
+                    format!("Accept {} ({})", rule_index + 1, grammar.rules()[rule_index])
                 },
             };