checkpoint

[sbp.git] / src / edu / berkeley / sbp / Token.java

diff --git a/src/edu/berkeley/sbp/Token.java b/src/edu/berkeley/sbp/Token.java
index 2be8f3e..a662e8a 100644 (file)
--- 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();
     }