X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FInput.java;h=d8374cdf08e35af3a76c9023e76708841f0f692f;hb=a7b84506c2e1ed63343db215f76afced082e2826;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..d8374cd 100644
--- 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 {