X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FInput.java;h=d19b20890411bc062eb51a8c49dc9b5b9f214b3c;hb=8a5250c184672495fae152e096b2e800749cd0db;hp=d8374cdf08e35af3a76c9023e76708841f0f692f;hpb=a7b84506c2e1ed63343db215f76afced082e2826;p=sbp.git
diff --git a/src/edu/berkeley/sbp/Input.java b/src/edu/berkeley/sbp/Input.java
index d8374cd..d19b208 100644
--- a/src/edu/berkeley/sbp/Input.java
+++ b/src/edu/berkeley/sbp/Input.java
@@ -6,16 +6,28 @@ import java.lang.ref.*;
import edu.berkeley.sbp.*;
import edu.berkeley.sbp.util.*;
-/** a token of input -- note that this represents an actual input token rather than an Element which matches a token */
-public interface Input {
+/** a stream of Tokens to be parsed */
+public interface Input {
- public Tok next(int numstates, int resets, int waits) throws IOException;
- public abstract Location getLocation();
+ /** returns the token just beyond the current location and advances beyond it */
+ public Token next() throws IOException;
+
+ /** returns the location the input stream is currently at */
+ public Location getLocation();
+
+ /** a location (position) in the input stream -- between tokens */
+ public static interface Location extends Comparable {
+
+ /** return the region between this location and loc */
+ public Region createRegion(Location loc);
- /** a location *between tokens* in the input stream */
- public static interface Location {
public String toString();
}
+
+ /** a contiguous set of Locations */
+ public static interface Region /* implements Topology> */ {
+ }
+
}