X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2Ftib%2FTib.java;h=0ce53b052b3bac75fcbd58d8c3e86301c55c8194;hb=6cbea0bd6ae3e4ce5a175767b3e926b9b902bdc4;hp=f15bfbb324023a1deaa08ce2d900fa036923e222;hpb=aa467fd9d82ee4ab751a6ced1e4f48864f494e90;p=sbp.git

diff --git a/src/edu/berkeley/sbp/tib/Tib.java b/src/edu/berkeley/sbp/tib/Tib.java
index f15bfbb..0ce53b0 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'; }
@@ -146,14 +146,14 @@ public class Tib implements Input<Character> {
                 Union u = new Union("???");
                 Union u2 = ((PreSequence)walk(tree, 0)).sparse(ws).buildUnion();
                 u2.add(Sequence.singleton(new Element[] { u }, 0));
-                return anonymousNonTerminal(new PreSequence[][] {
-                    new PreSequence[] {
-                        new PreSequence(new Element[] { CharRange.leftBrace,
-                                                        ws,
-                                                        u2,
-                                                        ws,
-                                                        CharRange.rightBrace
-                        })
+                return anonymousNonTerminal(new Sequence[][] {
+                    new Sequence[] {
+                        Sequence.singleton(new Element[] { CharRange.leftBrace,
+                                                           ws,
+                                                           u2,
+                                                           ws,
+                                                           CharRange.rightBrace
+                        }, 2)
                     }
                 });
             }