X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2Fmisc%2FCartesianInput.java;h=200396eaf532631221cd2a0224c365c639801ccc;hp=cf477ccc105bdafe3500f568049f3cb6c8f3aa65;hb=6a2ea790f843e058c7e67d3c7d1deebadcfe1fd5;hpb=3468ad83256a1b996f5ddc4406a040ee72f0274a

diff --git a/src/edu/berkeley/sbp/misc/CartesianInput.java b/src/edu/berkeley/sbp/misc/CartesianInput.java
index cf477cc..200396e 100644
--- a/src/edu/berkeley/sbp/misc/CartesianInput.java
+++ b/src/edu/berkeley/sbp/misc/CartesianInput.java
@@ -4,10 +4,10 @@ import java.util.*;
 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;
@@ -16,8 +16,8 @@ public abstract class CartesianInput<Tok> implements Token.Stream<Tok> {
     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;
@@ -39,14 +39,14 @@ public abstract class CartesianInput<Tok> implements Token.Stream<Tok> {
         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; }