X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FToken.java;h=10ab90f933c217b0d7302752580b773675946a37;hb=cf349fcf2f460e53ad5f9dd0397eb382c4aa92b2;hp=41ef3d1401abaae141d2d2ced727183c106b1c17;hpb=fd97655ce34c3aff1a47bfb2f45775ac711923b1;p=sbp.git

diff --git a/src/edu/berkeley/sbp/Token.java b/src/edu/berkeley/sbp/Token.java
index 41ef3d1..10ab90f 100644
--- a/src/edu/berkeley/sbp/Token.java
+++ b/src/edu/berkeley/sbp/Token.java
@@ -14,12 +14,12 @@ public interface Token {
     public abstract String toString();
 
     /** a sequence of input tokens; returns null when EOF is reached */
-    public static interface Stream<T extends Token> {
-        public T next() throws IOException;
+    public static interface Stream<Tok> {
+        public Tok 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();
     }