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 6693600..a30e269 100644 (file)
--- a/src/edu/berkeley/sbp/tib/Tib.java
+++ b/src/edu/berkeley/sbp/tib/Tib.java
@@ -42,7 +42,7 @@ public class Tib implements Input<Character> {
 
     int _row = 1;
     int _col = 0;
-    public Input.Location getLocation() { return new CartesianInput.Location(_row, _col); }
+    public Input.Location getLocation() { return new CartesianLocation(_row, _col); }
     private BufferedReader br;
 
     char left = CharRange.left;
@@ -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;
     }
@@ -83,9 +83,9 @@ public class Tib implements Input<Character> {
                 return null;
             }
             c = (char)i;
+            if (c=='\n') { _row++; _col=0; }
+            else         _col++;
         }
-        if (c=='\n') { _row++; _col=0; }
-        else         _col++;
         if (indenting) {
             if (c==' ') { indentation++; return done(c); }
             if (c=='\n') { indentation = 0; if (blank) return nextc(numstates, resets); blank = true; waiting = true; waitingChar='\n'; return '\n'; }
@@ -135,31 +135,27 @@ public class Tib implements Input<Character> {
 
     // Grammar //////////////////////////////////////////////////////////////////////////////
 
-    public static class Grammar extends MetaGrammar {
+    public static class Grammar extends ReflectiveGrammar {
         private int anon = 0;
-        private final Element ws = Repeat.maximal0(nonTerminal("w"));
-        public Grammar() { dropAll.add(ws); }
+        private final Element ws = Sequence.maximal0(getNonTerminal("w"));
+        public Grammar(Class c) { super(c); 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);
+                u2.add(Sequence.singleton(new Element[] { u }, 0));
+                return anonymousNonTerminal(new Sequence[][] {
+                    new Sequence[] {
+                        Sequence.singleton(new Element[] { CharRange.leftBrace,
+                                                           ws,
+                                                           u2,
+                                                           ws,
+                                                           CharRange.rightBrace
+                        }, 2)
+                    }
+                });
             }
             return super.walk(tree);
         }