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

diff --git a/src/edu/berkeley/sbp/Input.java b/src/edu/berkeley/sbp/Input.java
index a2c9baa..d19b208 100644
--- a/src/edu/berkeley/sbp/Input.java
+++ b/src/edu/berkeley/sbp/Input.java
@@ -6,19 +6,28 @@ import java.lang.ref.*;
 import edu.berkeley.sbp.*;
 import edu.berkeley.sbp.util.*;
 
-/** a stream of tokens to be parsed */
+/** <font color=purple>a stream of <tt>Token</tt>s to be parsed</font> */
 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();
+
+    /** <font color=purple>a location (position) in the input stream -- <i>between tokens</i></font> */
+    public static interface Location<Token> extends Comparable<Location> {
+
+        /** return the region between this location and <tt>loc</tt> */
+        public Region<Token> createRegion(Location<Token> loc);
 
-    /** a location *between tokens* in the input stream */
-    public static interface Location {
         public String toString();
     }
+
+    /** <font color=purple>a contiguous set of <tt>Location</tt>s</font> */
+    public static interface Region<Token> /* implements Topology<Location<Tok>> */ {
+    }
+
 }