X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FToken.java;h=a662e8a51bb9563b343af93e51d786bf62701e5b;hb=1177435c53540af2247a2fbd7b6fbcf059accbb8;hp=2be8f3e5c29ee913f6c85da5714466cd70d9c8ad;hpb=b0d313eb49712b23f9c71003c96f130f23a63526;p=sbp.git

diff --git a/src/edu/berkeley/sbp/Token.java b/src/edu/berkeley/sbp/Token.java
index 2be8f3e..a662e8a 100644
--- a/src/edu/berkeley/sbp/Token.java
+++ b/src/edu/berkeley/sbp/Token.java
@@ -5,7 +5,6 @@ import java.lang.reflect.*;
 import java.lang.ref.*;
 import edu.berkeley.sbp.*;
 import edu.berkeley.sbp.util.*;
-import edu.berkeley.sbp.*;
 
 /** a token of input -- note that this represents an <i>actual input token</i> rather than an <tt>Element</tt> which <i>matches</i> a token */
 public interface Token {
@@ -14,8 +13,8 @@ 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();
     }