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 b2383ac..3c3e184 100644 (file)
--- a/src/edu/berkeley/sbp/tib/Tib.java
+++ b/src/edu/berkeley/sbp/tib/Tib.java
@@ -55,9 +55,9 @@ public class Tib implements Input<Character> {
     private ArrayList<Integer> istack = new ArrayList<Integer>();
     public Character next(int numstates, int resets, int waits) throws IOException {
         Character ret = nextc(numstates, resets);
-        if      (ret==left)  System.out.print("\033[31m{\033[0m");
+        if      (ret==null) return null;
+        else if (ret==left)  System.out.print("\033[31m{\033[0m");
         else if (ret==right) System.out.print("\033[31m}\033[0m");
-        else if (ret==null) return null;
         else System.out.print(ret);
         return ret;
     }
@@ -137,29 +137,25 @@ public class Tib implements Input<Character> {
 
     public static class Grammar extends MetaGrammar {
         private int anon = 0;
-        private final Element ws = Repeat.maximal0(nonTerminal("w"));
+        private final Element ws = Repeat.maximal0(getNonTerminal("w"));
         public Grammar() { dropAll.add(ws); }
         public Object walk(Tree<String> tree) {
             String head = tree.head();
             if (tree.numChildren()==0) return super.walk(tree);
             if ("{".equals(head)) {
-                String s = "braced"+(anon++);
-                Union u = nonTerminal(s);
+                Union u = new Union("???");
                 Union u2 = ((PreSequence)walk(tree, 0)).sparse(ws).buildUnion();
                 u2.add(Sequence.singleton(new Element[] { u }, 0, null, null));
-                return nonTerminal(s,
-                                   new PreSequence[][] {
-                                       new PreSequence[] {
-                                           new PreSequence(new Element[] { CharRange.leftBrace,
-                                                                           ws,
-                                                                           u2,
-                                                                           ws,
-                                                                           CharRange.rightBrace
-                                           })
-                                       }
-                                   },
-                                   false,
-                                   false);
+                return anonymousNonTerminal(new PreSequence[][] {
+                    new PreSequence[] {
+                        new PreSequence(new Element[] { CharRange.leftBrace,
+                                                        ws,
+                                                        u2,
+                                                        ws,
+                                                        CharRange.rightBrace
+                        })
+                    }
+                });
             }
             return super.walk(tree);
         }