yay, new boolean resolution approach works

[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 07edde3..1014a55 100644 (file)
--- 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();
     }
-
 }
 
+