X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FInput.java;h=ac2c486e94db2cef4490805c1de49911b62227c1;hp=b326468aff26137e5e4a56ffcad3741c87d76b3d;hb=2afdfe14e78fa0597186614937c679a09d74ecdf;hpb=6a2ea790f843e058c7e67d3c7d1deebadcfe1fd5

diff --git a/src/edu/berkeley/sbp/Input.java b/src/edu/berkeley/sbp/Input.java
index b326468..ac2c486 100644
--- a/src/edu/berkeley/sbp/Input.java
+++ b/src/edu/berkeley/sbp/Input.java
@@ -1,27 +1,66 @@
+// (C) 2006-2007 all rights reserved; see LICENSE file for BSD-style license
+
 package edu.berkeley.sbp;
 import java.io.*;
 import java.util.*;
-import java.lang.reflect.*;
-import java.lang.ref.*;
-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 {
+// FEATURE: Region implements Topology<Location<Tok>>
 
-    /** this is declared abstract as a way of forcing subclasses to provide a thoughtful implementation */
-    public abstract String toString();
+/** <font color=purple>a stream of <tt>Token</tt>s to be parsed</font> */
+public interface Input<Token> {
 
-    /** 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();
-    }
+    /** the current location within the input stream */
+    public Location<Token> getLocation();
+
+    /** returns the token just beyond the current location and advances beyond it */
+    public Token next() throws IOException;
+   
+    /** a short string describing where the input is coming from, such as a filename */
+    public String getName();
+
+    /** might called by Parser when it is done with the input */
+    public void close();
+
+    /**
+     *  <b>Optional:</b> <i>If possible</i>, this method will return a
+     *  rendering of the input region (for example, if the input is a
+     *  region of characters, it would be those characters) --
+     *  otherwise, returns null.  In any case, the string returned
+     *  will be no more than <tt>maxLength</tt> characters long;
+     *  typically ellipses will be inserted to perform truncation.
+     */
+    public abstract String showRegion(Region<Token> r, int maxLength);
+
+    /** <font color=purple>a location (position) in the input stream <i>between tokens</i></font> */
+    public static interface Location<Token> extends Comparable<Location> {
+
+        /** return the region between this location and <tt>loc</tt> */
+        public Region<Token> createRegion(Location<Token> loc);
 
-    /** a location *between tokens* in the input stream */
-    public static interface Location {
         public String toString();
+
+        /** the location following this one */
+        public Location next();
+
+        /** the location preceding this one */
+        public Location prev();
     }
+
+    /** <font color=purple>a contiguous set of <tt>Location</tt>s</font> */
+    public static interface Region<Token> {
+
+        /** should return less than 80 chars if possible */
+        public abstract String toString();
+        
+        /** The location of the start of this region */
+        public abstract Location<Token> getStart();
+
+        /** The location of the end of this region */
+        public abstract Location<Token> getEnd();
+
+    }
+
 }