import java.lang.reflect.*;
import java.lang.ref.*;
import edu.berkeley.sbp.*;
-import edu.berkeley.sbp.Token.Location;
+import edu.berkeley.sbp.Input.Location;
import edu.berkeley.sbp.util.*;
-public abstract class CartesianInput<Tok> implements Token.Stream<Tok> {
+public abstract class CartesianInput<Tok> implements Input.Stream<Tok> {
private int line = 1;
private int col = 0;
public abstract boolean isCR();
long then = 0;
- private Token.Location location = new LocWrap(line, col);
- public Token.Location getLocation() { return location; }
+ private Input.Location location = new LocWrap(line, col);
+ public Input.Location getLocation() { return location; }
public Tok next(int numstates, int resets, int waits) throws IOException {
Tok t = next();
if (t==null) return null;
return t;
}
- public static class Location implements Token.Location {
+ public static class Location implements Input.Location {
public final int line;
public final int col;
public String toString() { return line + ":" + col; }
public Location(int line, int col) { this.line = line; this.col = col; }
}
- private class LocWrap implements Token.Location {
+ private class LocWrap implements Input.Location {
public final int line;
public final int col;
public String toString() { return line + ":" + col; }