X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2Ftib%2FTib.java;h=f802ab0a44a663a84ed0951d3fcdfbd82c49a0d3;hb=2177e4743ea680e24f0cc0525185e8f95d0dd41b;hp=0cf3aab191d93ee07d1bf1a297b0616f509303b3;hpb=2633ae37e220233b3bb8a71632e37a3070be6e97;p=sbp.git

diff --git a/src/edu/berkeley/sbp/tib/Tib.java b/src/edu/berkeley/sbp/tib/Tib.java
index 0cf3aab..f802ab0 100644
--- a/src/edu/berkeley/sbp/tib/Tib.java
+++ b/src/edu/berkeley/sbp/tib/Tib.java
@@ -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,10 +135,10 @@ 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(getNonTerminal("w"));
-        public Grammar() { dropAll.add(ws); }
+        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);