X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2Fmisc%2FCharToken.java;h=0793d803355db27e095f021870a12b7c2a1a257c;hb=21da21b94e794fa4d7c7207327764895d92ea528;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..0793d80 100644
--- a/src/edu/berkeley/sbp/misc/CharToken.java
+++ b/src/edu/berkeley/sbp/misc/CharToken.java
@@ -9,7 +9,7 @@ import edu.berkeley.sbp.util.*;
import edu.berkeley.sbp.*;
/** an implementation of Token for streams of Java char values */
-public class CharToken implements Token, IntegerTopology.IntegerMappable {
+public class CharToken implements Token, IntegerMappable {
// Public //////////////////////////////////////////////////////////////////////////////
@@ -17,7 +17,7 @@ public class CharToken implements Token, IntegerTopology.IntegerMappable {
public CharToStringParser(Union u) { super(u); }
public Topology top() { return new IntegerTopology(); }
public Forest shiftedToken(CharToken ct, Token.Location loc) {
- return Forest.create(loc, ct.result(), null, null, false, false);
+ return Forest.create(loc, ct.result(), null, false, false);
}
}
@@ -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; }
- 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 +164,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;