checkpoint: tweaking typed grammar

Devin-Yeung · Nov 11, 2024 · 6ab62ea · 6ab62ea
1 parent c6c95cc
commit 6ab62ea
Show file tree

Hide file tree

Showing 4 changed files with 107 additions and 110 deletions.
diff --git a/examples/set-algebra-typed.bnfgen b/examples/set-algebra-typed.bnfgen
@@ -18,8 +18,8 @@
 <Algebra>    ::= <Expr>
                  | <Predicate> ;
 
-// <Expr0: "set">   ::= "{" <Id> ":" <Predicate> "}" ;
-<Expr0: "set">   ::= "{" <Id> ":" "Predicate" "}" ;
+<Expr0: "set">   ::= "{" <Id> ":" <Predicate> "}" ;
+// <Expr0: "set">   ::= "{" <Id> ":" "Predicate" "}" ;
 
 <Expr0: "int">   ::= "(" <Expr: "int"> ")"
                      | 100 <Num>
@@ -38,21 +38,19 @@
 <Expr: "set">    ::= 2 <Expr1: "set">
                      | <Expr: "set"> "U" <Expr1: "set"> ;
 
-<Predicate0: "relation"> ::= <Expr: "int"> "<" <Expr: "int">
-                             | <Expr: "int"> ">" <Expr: "int">
-                             | <Expr: "int"> "=" <Expr: "int"> ;
-
-<Predicate0: "relation"> ::= <Expr: "int"> "@" <Expr: "set"> ;
-
+<Predicate0: "relation"> ::= 2 <Expr: "int"> "<" <Expr: "int">
+                             | 2 <Expr: "int"> ">" <Expr: "int">
+                             | 2 <Expr: "int"> "=" <Expr: "int"> 
+                             | <Expr: "int"> "@" <Expr: "set"> ;
 
 <Predicate1> ::= "(" <Predicate> ")"
                  | 2 "!" <Predicate0>
-                 | 2 <Predicate0> ;
+                 | 10 <Predicate0> ;
 
-<Predicate2>  ::= 10 <Predicate1>
-                 | <Predicate2> "&" <Predicate1> ;
+<Predicate2>  ::= 2 <Predicate1>
+                  | <Predicate2> "&" <Predicate1> ;
 
-<Predicate>  ::= 10 <Predicate2>
+<Predicate>  ::= 2 <Predicate2>
                  | <Predicate> "|" <Predicate2> ;
 
 <EOL>       ::= 1000 "\n" | "" ; // For generation purposes, make it looks better
diff --git a/src/generator.rs b/src/generator.rs
@@ -22,9 +22,6 @@ impl Generator {
             // pop out the first symbol
             match self.grammar.reduce(stack.remove(0), &mut state) {
                 ReduceOutput::Terminal(s) => {
-                    println!("{s}");
-                    use std::io::Write;
-                    std::io::stdout().flush().unwrap();
                     buf.push(s);
                 }
                 ReduceOutput::NonTerminal { mut syms, .. } => {
@@ -128,7 +125,10 @@ mod test {
         let grammar = RawGrammar::parse(text).unwrap().to_checked().unwrap();
         let gen = Generator { grammar };
         let mut seeded_rng = rand::rngs::StdRng::seed_from_u64(42);
-        let out = (0..100).map(|_| gen.generate("Expr", &mut seeded_rng)).collect::<Vec<_>>().join("\n");
+        let out = (0..100)
+            .map(|_| gen.generate("Expr", &mut seeded_rng))
+            .collect::<Vec<_>>()
+            .join("\n");
         insta::assert_snapshot!(out);
     }
 }
diff --git a/src/grammar/symbol.rs b/src/grammar/symbol.rs
@@ -1,6 +1,5 @@
 use crate::regex::Regex;
 use crate::span::Span;
-use std::borrow::Borrow;
 use std::hash::Hash;
 use std::rc::Rc;