Tib cleanups

[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 41aab5c..387f5ed 100644 (file)
--- a/src/edu/berkeley/sbp/tib/Tib.java
+++ b/src/edu/berkeley/sbp/tib/Tib.java
@@ -28,8 +28,6 @@ public class Tib implements Input<Character> {
     public Tib(BufferedReader br) throws IOException {
         this.br = br;
         istack.add(-1);
-        //cur = parse(br);
-        //System.out.println("\rparsing: \"" + cur.toString(0, -1) + "\"");
     }
     public String getName() { return null; }
     private String s = "";
@@ -55,9 +53,9 @@ public class Tib implements Input<Character> {
         Character ret = nextc();
         if (debug) {
             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 System.out.print(ret);
+            else if (ret==left)  System.err.print("\033[31m{\033[0m");
+            else if (ret==right) System.err.print("\033[31m}\033[0m");
+            else System.err.print(ret);
         }
         return ret;
     }
@@ -134,66 +132,5 @@ public class Tib implements Input<Character> {
     }
     boolean blank = false;
 
-    // Grammar //////////////////////////////////////////////////////////////////////////////
-
-    /*
-    public static class Grammar extends ReflectiveGrammar {
-        private int anon = 0;
-        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)) {
-                Union u = new Union("???");
-                Union u2 = ((PreSequence)walk(tree, 0)).sparse(ws).buildUnion();
-                u2.add(Sequence.singleton(new Element[] { u }, 0));
-                return anonymousNonTerminal(new Sequence[][] {
-                    new Sequence[] {
-                        Sequence.singleton(new Element[] { CharAtom.leftBrace,
-                                                           ws,
-                                                           u2,
-                                                           ws,
-                                                           CharAtom.rightBrace
-                        }, 2)
-                    }
-                });
-            }
-            return super.walk(tree);
-        }
-    }
-    */
-
-    /*
-public class Braces extends Union {
-
-    private static final Element left  = string("{");
-    private static final Element right = string("}");
-    
-    public static String join(Object[] e) {
-        StringBuffer ret = new StringBuffer();
-        for(int i=0; i<e.length; i++) {
-            if (i>0) ret.append(" ");
-            ret.append(e[i]);
-        }
-        return ret.toString();
-    }
-
-    public Braces(Element[] e, Element sep) {
-        super("{"+join(e)+"}");
-        Element[] e2 = new Element[sep == null ? e.length+2 : e.length + 4];
-        e2[0]           = left;
-        e2[e2.length-1] = right;
-        if (sep != null) {
-            e2[1] = sep;
-            e2[e2.length-2] = sep;
-        }
-        for(int i=0; i<e.length; i++) e2[i+(sep==null ? 1 : 2)] = e[i];
-        addAlternative(new Sequence.Singleton(e2));
-        addAlternative(new Sequence.Singleton(sep==null ? new Element[] { left, this, right} : new Element[] { left, sep, this, sep, right }));
-    }
-}
-                      */
-
 }