projects
/
sbp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
checkpoint
[sbp.git]
/
src
/
edu
/
berkeley
/
sbp
/
Input.java
diff --git
a/src/edu/berkeley/sbp/Input.java
b/src/edu/berkeley/sbp/Input.java
index
b326468
..
a2c9baa
100644
(file)
--- 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.*;
import edu.berkeley.sbp.*;
import edu.berkeley.sbp.util.*;
-/** a token of input -- note that this represents an <i>actual input token</i> rather than an <tt>Element</tt> which <i>matches</i> a token */
-public interface Input {
+/** a stream of tokens to be parsed */
+public interface Input<Token> {
- /** 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<Tok> {
- 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 {
/** a location *between tokens* in the input stream */
public static interface Location {