X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2Fmisc%2FCharToken.java;h=2042145e68de43cce3b8b49737c82d2aceb1e24f;hb=cf349fcf2f460e53ad5f9dd0397eb382c4aa92b2;hp=9d10889d92911abfba73c34ec747f9a1dc421f6c;hpb=08aa6cdd07a882fdedf7a6d5c7bd0d754460965b;p=sbp.git

diff --git a/src/edu/berkeley/sbp/misc/CharToken.java b/src/edu/berkeley/sbp/misc/CharToken.java
index 9d10889..2042145 100644
--- a/src/edu/berkeley/sbp/misc/CharToken.java
+++ b/src/edu/berkeley/sbp/misc/CharToken.java
@@ -9,15 +9,14 @@ import edu.berkeley.sbp.util.*;
 import edu.berkeley.sbp.*;
 
 /** an implementation of Token for streams of Java <tt>char</tt> values */
-public class CharToken implements Token, IntegerTopology.IntegerMappable {
+public class CharToken implements Token, IntegerMappable {
 
     // Public //////////////////////////////////////////////////////////////////////////////
 
     public static class CharToStringParser extends Parser<CharToken,String> {
-        public CharToStringParser(Union u) { super(u); }
-        public Topology<CharToken> top() { return new IntegerTopology<CharToken>(); }
-        public Forest<String> shiftedToken(CharToken ct, Token.Location loc) {
-            return Forest.create(loc, ct.result(), null, null, false, false);
+        public CharToStringParser(Union u) { super(u, new IntegerTopology<CharToken>()); }
+        public Forest<String> shiftToken(CharToken ct, Token.Location loc) {
+            return Forest.create(loc, ct.result(), null, false, false);
         }
     }
 
@@ -154,7 +153,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; }
-        public Token next(int numstates) throws IOException {
+        public Token next(int numstates, int resets, int waits) throws IOException {
             int i = r.read();
             if (i==-1) return null;
             char c = (char)i;
@@ -164,7 +163,7 @@ public class CharToken implements Token, IntegerTopology.IntegerMappable {
             while(s.length() < 4) s = " " + s;
             s = "line "+s+", col " + col;
             while(s.length() < 20) s += " ";
-            s += "[ambiguity level: " + (numstates-1) + "]";
+            s += "[ambiguity level: " + (numstates-1) + "] [resets: " + resets + "] [waits: " + waits + "]";
             long now = System.currentTimeMillis();
             if (now-then > 10) {
                 then = now;