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..d8374cd 100644 (file)
--- a/src/edu/berkeley/sbp/Input.java
+++ b/src/edu/berkeley/sbp/Input.java
@@ -7,16 +7,10 @@ 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 {
+public interface Input<Tok> {
 
-    /** this is declared abstract as a way of forcing subclasses to provide a thoughtful implementation */
-    public abstract String toString();
-
-    /** 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();
-    }
+    public Tok next(int numstates, int resets, int waits) throws IOException;
+    public abstract Location getLocation();
 
     /** a location *between tokens* in the input stream */
     public static interface Location {