checkpoint

[sbp.git] / src / edu / berkeley / sbp / misc / StringInput.java

diff --git a/src/edu/berkeley/sbp/misc/StringToken.java b/src/edu/berkeley/sbp/misc/StringInput.java
similarity index 67%
rename from src/edu/berkeley/sbp/misc/StringToken.java
rename to src/edu/berkeley/sbp/misc/StringInput.java
index b21e458..1f3d0d3 100644 (file)
--- a/src/edu/berkeley/sbp/misc/StringToken.java
+++ b/src/edu/berkeley/sbp/misc/StringInput.java
@@ -4,24 +4,23 @@ import java.util.*;
 import java.lang.reflect.*;
 import java.lang.ref.*;
 import edu.berkeley.sbp.*;
-import edu.berkeley.sbp.*;
+import edu.berkeley.sbp.Input.Location;
 import edu.berkeley.sbp.util.*;
-import edu.berkeley.sbp.*;
 
 /** an implementation of Input for streams of Java <tt>char</tt> values */
-public class StringToken implements Input {
+public class StringInput {
 
-    public static final StringToken left = new StringToken(null, null) { public boolean equals(Object o) { return this==o; } };
-    public static final StringToken right = new StringToken(null, null) { public boolean equals(Object o) { return this==o; } };
+    public static final StringInput left = new StringInput(null, null) { public boolean equals(Object o) { return this==o; } };
+    public static final StringInput right = new StringInput(null, null) { public boolean equals(Object o) { return this==o; } };
 
-    public static final Atom leftBrace  = new StringAtom(new DiscreteTopology<StringToken>(left)) { public String toString() { return "{"; } };
-    public static final Atom rightBrace = new StringAtom(new DiscreteTopology<StringToken>(right)) { public String toString() { return "}"; } };
+    public static final Atom leftBrace  = new StringAtom(new DiscreteTopology<StringInput>(left)) { public String toString() { return "{"; } };
+    public static final Atom rightBrace = new StringAtom(new DiscreteTopology<StringInput>(right)) { public String toString() { return "}"; } };
 
     private static class StringAtom extends Atom {
         private String s;
         private Topology t;
-        public StringAtom(String s) { this.t = new DiscreteTopology<StringToken>(new StringToken(s, null)); this.s = s; }
-        public StringAtom(Topology<StringToken> t) { this.t = t; }
+        public StringAtom(String s) { this.t = new DiscreteTopology<StringInput>(new StringInput(s, null)); this.s = s; }
+        public StringAtom(Topology<StringInput> t) { this.t = t; }
         public String toString() { return "[atom \""+s+"\"]"; }
         public Topology top() { return t; }
     }
@@ -31,15 +30,15 @@ public class StringToken implements Input {
         return new StringAtom(s);
     }
 
-    public static Topology<StringToken> top() { return new DiscreteTopology<StringToken>(); }
+    public static Topology<StringInput> top() { return new DiscreteTopology<StringInput>(); }
 
     public final String s;
     public final Location location;
-    private StringToken(String s, Location loc)    { this.s = s; this.location = loc; }
+    private StringInput(String s, Location loc)    { this.s = s; this.location = loc; }
     public String result()                         { return s; }
     public Location getLocation()                  { return location; }
     public String  toString()                      { return "\'"+StringUtil.escapify(s)+"\'"; }
 
-    public boolean equals(Object o) { return o!=null && o instanceof StringToken && s.equals(((StringToken)o).s); }
+    public boolean equals(Object o) { return o!=null && o instanceof StringInput && s.equals(((StringInput)o).s); }
     public int     hashCode()       { return s==null ? 0 : s.hashCode(); }
 }