- 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();
+ private CartesianLocation location = new CartesianLocation(1, 0);
+ public Input.Location getLocation() { return location; }
+
+ public Token next(int numstates, int resets, int waits) throws IOException {
+ int line = location.line;
+ int col = location.col;
+ Token t = next();