X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FInput.java;h=9948ae40a2b69bf8cf42cd7198a214a35ef019b6;hb=23091054a6842031d168c2628216c2310149cc5d;hp=a2c9baa1c84c47e4feccb2ed117e9735929bc3fa;hpb=c7af09d552a9cf2d53a72baa975c9a73384813ea;p=sbp.git

diff --git a/src/edu/berkeley/sbp/Input.java b/src/edu/berkeley/sbp/Input.java
index a2c9baa..9948ae4 100644
--- a/src/edu/berkeley/sbp/Input.java
+++ b/src/edu/berkeley/sbp/Input.java
@@ -10,15 +10,18 @@ import edu.berkeley.sbp.util.*;
 public interface Input<Token> {
 
     /** returns the token just beyond the current location and advances beyond it */
-    public Token    next(int numstates, int resets, int waits) throws IOException;
+    public Token           next() throws IOException;
 
     /** returns the location the input stream is currently at */
-    public Location getLocation();
+    public Location<Token> getLocation();
 
-    /** a location *between tokens* in the input stream */
-    public static interface Location {
+    /** a location <i>between tokens<i> in the input stream */
+    public static interface Location<Tok> extends Comparable<Location> {
         public String toString();
+        public Region<Tok> createRegion(Location<Tok> loc);
     }
+
+    public static interface Region<Tok> /* implements Topology<Location<Tok>> */ { }
 }