X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FInput.java;h=a2c9baa1c84c47e4feccb2ed117e9735929bc3fa;hb=8ac1795e6098dcf10b94a854351162695181b83d;hp=b326468aff26137e5e4a56ffcad3741c87d76b3d;hpb=6a2ea790f843e058c7e67d3c7d1deebadcfe1fd5;p=sbp.git
diff --git a/src/edu/berkeley/sbp/Input.java b/src/edu/berkeley/sbp/Input.java
index b326468..a2c9baa 100644
--- a/src/edu/berkeley/sbp/Input.java
+++ b/src/edu/berkeley/sbp/Input.java
@@ -6,17 +6,14 @@ 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 {
- /** this is declared abstract as a way of forcing subclasses to provide a thoughtful implementation */
- public abstract String toString();
+ /** returns the token just beyond the current location and advances beyond it */
+ public Token next(int numstates, int resets, int waits) throws IOException;
- /** a sequence of input tokens; returns null when EOF is reached */
- public static interface Stream {
- public Tok next(int numstates, int resets, int waits) throws IOException;
- public abstract Location getLocation();
- }
+ /** returns the location the input stream is currently at */
+ public Location getLocation();
/** a location *between tokens* in the input stream */
public static interface Location {