X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FToken.java;h=1014a55650d021bd4f051094c18631f6b6aeb6e4;hp=faa02b915fcfecf8adccbae858632c80184b6a2e;hb=842f3c9b981b35721bb50d49e85c11085b2040a3;hpb=799bc0f3253172bd0cc3b54c90566825ac1a51c9

diff --git a/src/edu/berkeley/sbp/Token.java b/src/edu/berkeley/sbp/Token.java
index faa02b9..1014a55 100644
--- a/src/edu/berkeley/sbp/Token.java
+++ b/src/edu/berkeley/sbp/Token.java
@@ -13,17 +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();
     }
-
 }
 
+