checkpoint

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

diff --git a/src/edu/berkeley/sbp/misc/CharRange.java b/src/edu/berkeley/sbp/misc/CharRange.java
index 18f89a0..475a68c 100644 (file)
--- a/src/edu/berkeley/sbp/misc/CharRange.java
+++ b/src/edu/berkeley/sbp/misc/CharRange.java
@@ -10,6 +10,8 @@ import edu.berkeley.sbp.util.*;
 public class CharRange extends Atom<Character> {
     private String esc(char c) { return StringUtil.escapify(c+"", "[]-~\\\"\'"); }
     private Topology<Character> t;
+    public CharRange(char a) { this(a,a); }
+    public CharRange(char a, char b) { this(new CharTopology(a, b)); }
     public CharRange(Topology<Character> t) { this.t = t; }
     public Topology<Character> top() { return t; }
     public String toString() {
@@ -34,9 +36,13 @@ public class CharRange extends Atom<Character> {
         sb.append(']');
         return sb.toString();
     }
-    public static final Atom leftBrace  = CharToken.leftBrace;
-    public static final Atom rightBrace = CharToken.rightBrace;
-    public static Atom set(Range.Set r) { return new CharRange(new IntegerTopology<Character>(CharToken.c2i, r)); }
+
+    public static final char left       = (char)9998;
+    public static final char right      = (char)9999;
+    public static final Atom leftBrace  = new CharRange(left,left)   { public String toString() { return "{"; } };
+    public static final Atom rightBrace = new CharRange(right,right) { public String toString() { return "}"; } };
+
+    public static Atom set(Range.Set r) { return new CharRange(new CharTopology(r)); }
     private static final Range.Set all = new Range.Set(new Range(0, Character.MAX_VALUE));
 
     /** returns an element which exactly matches the string given */
@@ -46,13 +52,13 @@ public class CharRange extends Atom<Character> {
         Element ret;
         if (s.length() == 1) {
             ret =
-                new CharRange(new IntegerTopology<Character>(CharToken.c2i, (int)s.charAt(0))) {
+                new CharRange(s.charAt(0)) {
                     public String toString() { return escapified; } };
         } else {
             Union ret2 = new Union("\""+s+"\"_str", true) {
                     public String toString() { return escapified; } };
             Element[] refs = new Element[s.length()];
-            for(int i=0; i<refs.length; i++) refs[i] = new CharRange(new IntegerTopology<Character>(CharToken.c2i, (int)s.charAt(i)));
+            for(int i=0; i<refs.length; i++) refs[i] = new CharRange(s.charAt(i));
             ret2.add(Sequence.constant(refs, s, null, null));
             ret = ret2;
         }