X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Fedu%2Fberkeley%2Fsbp%2FToken.java;h=1014a55650d021bd4f051094c18631f6b6aeb6e4;hb=e14f41fe193ceef8dfd8b4bc2f327e3550231a4c;hp=07edde397e53ee16f29a9a4046d658d26b0d98bd;hpb=96a2822a729e563a64173f22dc184bc972a200ef;p=sbp.git

diff --git a/src/edu/berkeley/sbp/Token.java b/src/edu/berkeley/sbp/Token.java
index 07edde3..1014a55 100644
--- a/src/edu/berkeley/sbp/Token.java
+++ b/src/edu/berkeley/sbp/Token.java
@@ -13,18 +13,16 @@ public interface Token {
     /** this is declared abstract as a way of forcing subclasses to provide a thoughtful implementation */
     public abstract String toString();
 
-    public abstract Location getLocation();
-
     /** a sequence of input tokens; returns null when EOF is reached */
     public static interface Stream<T extends Token> {
-        public T next() throws IOException;
+        public T next(int numstates, int resets, int waits) throws IOException;
+        public abstract Location getLocation();
     }
 
-    /** a location within the input stream */
+    /** a location *between tokens* in the input stream */
     public static interface Location {
         public String toString();
-        public String getContext();
     }
-
 }
 
+