X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FInput.java;h=d19b20890411bc062eb51a8c49dc9b5b9f214b3c;hb=d28917b3c84c429e8fd6587717df9e90a894b18f;hp=407d843a51f0651d32e51214cf83df36199fb767;hpb=c8a17fdd2e149fe5feecd96c71b7f2cab286ab96;p=sbp.git
diff --git a/src/edu/berkeley/sbp/Input.java b/src/edu/berkeley/sbp/Input.java
index 407d843..d19b208 100644
--- a/src/edu/berkeley/sbp/Input.java
+++ b/src/edu/berkeley/sbp/Input.java
@@ -6,7 +6,7 @@ import java.lang.ref.*;
import edu.berkeley.sbp.*;
import edu.berkeley.sbp.util.*;
-/** a stream of tokens to be parsed */
+/** a stream of Tokens to be parsed */
public interface Input {
/** returns the token just beyond the current location and advances beyond it */
@@ -15,24 +15,19 @@ public interface Input {
/** returns the location the input stream is currently at */
public Location getLocation();
- /** a location between tokens in the input stream */
- public static interface Location extends Comparable {
+ /** a location (position) in the input stream -- between tokens */
+ public static interface Location extends Comparable {
+
+ /** return the region between this location and loc */
+ public Region createRegion(Location loc);
+
public String toString();
}
- public static class Region /* implements Topology> */ {
- public final Loc start;
- public final Loc end;
- public String toString() { return start+"-"+end; }
- public Region(Loc a, Loc b) {
- switch(a.compareTo(b)) {
- case -1:
- case 0: start=a; end=b; return;
- case 1: start=b; end=a; return;
- default: throw new Error("impossible");
- }
- }
+ /** a contiguous set of Locations */
+ public static interface Region /* implements Topology> */ {
}
+
}