projects
/
sbp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
yay, new boolean resolution approach works
[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
9d10889
..
fb02aaf
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(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;
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 += " ";
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;
long now = System.currentTimeMillis();
if (now-then > 10) {
then = now;