got new tib tokenizer going

[sbp.git] / src / edu / berkeley / sbp / misc / CharToken.java

diff --git a/src/edu/berkeley/sbp/misc/CharToken.java b/src/edu/berkeley/sbp/misc/CharToken.java
index 8804fee..9d10889 100644 (file)
--- a/src/edu/berkeley/sbp/misc/CharToken.java
+++ b/src/edu/berkeley/sbp/misc/CharToken.java
@@ -154,7 +154,7 @@ public class CharToken implements Token, IntegerTopology.IntegerMappable {
         long then = 0;
         private Token.Location location = new LocWrap(1, 1);
         public Token.Location getLocation() { return location; }
         long then = 0;
         private Token.Location location = new LocWrap(1, 1);
         public Token.Location getLocation() { return location; }

-        public Token next() throws IOException {
+        public Token next(int numstates) throws IOException {

             int i = r.read();
             if (i==-1) return null;
             char c = (char)i;
             int i = r.read();
             if (i==-1) return null;
             char c = (char)i;

@@ -163,10 +163,12 @@ public class CharToken implements Token, IntegerTopology.IntegerMappable {
             String s = line + "";
             while(s.length() < 4) s = " " + s;
             s = "line "+s+", col " + col;
             String s = line + "";
             while(s.length() < 4) s = " " + s;
             s = "line "+s+", col " + col;

+            while(s.length() < 20) s += " ";
+            s += "[ambiguity level: " + (numstates-1) + "]";

             long now = System.currentTimeMillis();
             if (now-then > 10) {
                 then = now;
             long now = System.currentTimeMillis();
             if (now-then > 10) {
                 then = now;

-                System.out.print("  "+(message==null?"":message)+" " + s + "                                                                      \r");
+                System.out.print("  "+(message==null?"":message)+" " + s + "                                \r");

             }
             if (c=='\n') { 
                 currentLine = new Line();
             }
             if (c=='\n') { 
                 currentLine = new Line();