checkpoint

[sbp.git] / src / edu / berkeley / sbp / tib / Tib.java

diff --git a/src/edu/berkeley/sbp/tib/Tib.java b/src/edu/berkeley/sbp/tib/Tib.java
index 59336df..eabc9ee 100644 (file)
--- a/src/edu/berkeley/sbp/tib/Tib.java
+++ b/src/edu/berkeley/sbp/tib/Tib.java
@@ -289,6 +289,10 @@ public class Tib implements Token.Stream<CharToken> {
 
     public static class Grammar extends MetaGrammar {
         private int anon = 0;
+        private final Element ws = Repeat.maximal(Repeat.many0(nonTerminal("w")));
+        public Grammar() {
+            dropAll.add(ws);
+        }
         public Object walk(Tree<String> tree) {
             String head = tree.head();
             if (tree.numChildren()==0) return super.walk(tree);
@@ -297,9 +301,9 @@ public class Tib implements Token.Stream<CharToken> {
                                    new PreSequence[][] {
                                        new PreSequence[] {
                                            new PreSequence(new Element[] { CharToken.leftBrace,
-                                                                           Repeat.maximal(Repeat.many0(nonTerminal("w"))),
-                                                                           ((PreSequence)walk(tree, 0)).buildUnion(),
-                                                                           Repeat.maximal(Repeat.many0(nonTerminal("w"))),
+                                                                           ws,
+                                                                           ((PreSequence)walk(tree, 0)).sparse(ws).buildUnion(),
+                                                                           ws,
                                                                            CharToken.rightBrace
                                            })
                                        }