X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2Fmisc%2FCharToken.java;h=eba6cbebe4a69cf31ebab85af43a9cc77950bad1;hp=eccac6a2949ce1ee58b84081eb9da62d0846df94;hb=96a2822a729e563a64173f22dc184bc972a200ef;hpb=2724e3d1df836f6ce40bc4227f1509e777de2e48

diff --git a/src/edu/berkeley/sbp/misc/CharToken.java b/src/edu/berkeley/sbp/misc/CharToken.java
index eccac6a..eba6cbe 100644
--- a/src/edu/berkeley/sbp/misc/CharToken.java
+++ b/src/edu/berkeley/sbp/misc/CharToken.java
@@ -13,9 +13,19 @@ public class CharToken implements Token, IntegerTopology.IntegerMappable {
 
     // Public //////////////////////////////////////////////////////////////////////////////
 
+    public static class CharToStringParser extends Parser<CharToken,String> {
+        public CharToStringParser(Union u) { super(u); }
+        public Topology<CharToken> top() { return new IntegerTopology<CharToken>(); }
+        public Forest<String> shiftedToken(CharToken ct) {
+            return Forest.create(ct.getLocation(), ct.result(), null, null, false, false);
+        }
+    }
+
     public static class CharRange extends Atom<CharToken> {
         private String esc(char c) { return StringUtil.escapify(c+"", "[]-~\\\"\'"); }
-        public CharRange(Topology<CharToken> t) { super(t); }
+        private Topology<CharToken> t;
+        public CharRange(Topology<CharToken> t) { this.t = t; }
+        public Topology<CharToken> top() { return t; }
         public String toString() {
             StringBuffer sb = new StringBuffer();
             sb.append('[');
@@ -50,8 +60,10 @@ public class CharToken implements Token, IntegerTopology.IntegerMappable {
         return new CharRange(new IntegerTopology<CharToken>(new Range.Set(new Range((int)start, (int)end)).complement().intersect(all)));
     }
 
-    public static final Atom leftBrace  = new Atom(new IntegerTopology<CharToken>(-3)) { public String toString() { return "{"; } };
-    public static final Atom rightBrace = new Atom(new IntegerTopology<CharToken>(-4)) { public String toString() { return "}"; } };
+    public static CharToken left(int row, int col) { return new CharToken((char)9998, 0, 0) { public String toString() { return "{"; } }; }
+    public static CharToken right(int row, int col) { return new CharToken((char)9999, 0, 0) { public String toString() { return "}"; } }; }
+    public static final Atom leftBrace  = new CharRange(new IntegerTopology<CharToken>(9998)) { public String toString() { return "{"; } };
+    public static final Atom rightBrace = new CharRange(new IntegerTopology<CharToken>(9999)) { public String toString() { return "}"; } };
 
     private static final Range.Set all = new Range.Set(new Range(0, Character.MAX_VALUE));
     public  static final Atom      any = new CharRange(new IntegerTopology<CharToken>(all));
@@ -61,7 +73,7 @@ public class CharToken implements Token, IntegerTopology.IntegerMappable {
 
     /** returns an element which exactly matches the string given */
     public static Element string(String s) {
-        if (s.length() == 0) return MetaGrammar.epsilon;
+        if (s.length() == 0) return Union.epsilon;
         final String escapified = "\""+StringUtil.escapify(s, "\"\r\n\\")+"\"";
         Element ret;
         if (s.length() == 1) {
@@ -89,7 +101,7 @@ public class CharToken implements Token, IntegerTopology.IntegerMappable {
 
     public final char c;
     public final Location location;
-    private CharToken(char c, int line, int col)   { this(c, new CartesianLocation(line, col)); }
+    public CharToken(char c, int line, int col)   { this(c, new CartesianLocation(line, col)); }
     private CharToken(char c, Location loc)        { this.c = c; this.location = loc; }
     public String result()                         { return c+""; }
     public Location getLocation()                  { return location; }