X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FInput.java;h=9948ae40a2b69bf8cf42cd7198a214a35ef019b6;hb=23091054a6842031d168c2628216c2310149cc5d;hp=be41cbebeff1af501c5a65d25c5318a14f1210e9;hpb=ac3843911c47a601ffd679d2e075b519d3a18d6a;p=sbp.git

diff --git a/src/edu/berkeley/sbp/Input.java b/src/edu/berkeley/sbp/Input.java
index be41cbe..9948ae4 100644
--- a/src/edu/berkeley/sbp/Input.java
+++ b/src/edu/berkeley/sbp/Input.java
@@ -18,39 +18,10 @@ public interface Input<Token> {
     /** a location <i>between tokens<i> in the input stream */
     public static interface Location<Tok> extends Comparable<Location> {
         public String toString();
-
-        /** an implementation of Location for a cartesian grid (row, col) */
-        public static class Cartesian<Tok> implements Location<Tok>, Comparable<Location> {
-            protected final int row;
-            protected final int col;
-            public String toString() { return row+":"+col; }
-            public int getCol() { return col; }
-            public int getRow() { return row; }
-            public Cartesian(int col, int row) { this.row = row; this.col = col; }
-            public int compareTo(Location loc) throws ClassCastException {
-                if (!(loc instanceof Cartesian)) throw new ClassCastException();
-                Cartesian<Tok> c = (Cartesian<Tok>)loc;
-                if (row < c.row) return -1;
-                if (row > c.row) return  1;
-                if (col < c.col) return -1;
-                if (col > c.col) return  1;
-                return 0;
-            }
-        }
+        public Region<Tok> createRegion(Location<Tok> loc);
     }
 
-    public static class Region<Loc extends Location> /* implements Topology<Location<Tok>> */ {
-        public final Loc start;
-        public final Loc 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");
-            }
-        }
-    }
+    public static interface Region<Tok> /* implements Topology<Location<Tok>> */ { }
 }