X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2Fchr%2FCharRange.java;h=78f2057d7d233935856408bf197af94ecc0098a4;hp=123e6cac7bd8bcec0ef4c7681ccdc70ea1b98388;hb=38eb7943a4be918d46cb6517004e57ca91410ce0;hpb=36c0a6a931c043959183226705e14a6a6b82c5d2

diff --git a/src/edu/berkeley/sbp/chr/CharRange.java b/src/edu/berkeley/sbp/chr/CharRange.java
index 123e6ca..78f2057 100644
--- a/src/edu/berkeley/sbp/chr/CharRange.java
+++ b/src/edu/berkeley/sbp/chr/CharRange.java
@@ -12,15 +12,16 @@ public class CharRange extends Atom<Character> {
 
     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 CharRange(CharTopology t) { this.t = t; }
 
-    private Topology<Character> t;
+    private CharTopology t;
     public  Topology<Character> top() { return t; }
 
     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 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 final Atom braces     = new CharRange(left,right)   { public String toString() { return "[{}]"; } };
 
     public static Atom set(Range.Set r) { return new CharRange(new CharTopology(r)); }
 
@@ -29,7 +30,7 @@ public class CharRange extends Atom<Character> {
     /** returns an element which exactly matches the string given */
     public static Element string(String s) { return string(s, true); }
     public static Element string(String s, boolean share) {
-        if (share && s.length() == 0) return Union.epsilon;
+        if (share && s.length() == 0) return epsilon;
         final String escapified = "\""+StringUtil.escapify(s, "\"\r\n\\")+"\"";
         Element ret;
         if (share && s.length() == 1) {
@@ -47,4 +48,6 @@ public class CharRange extends Atom<Character> {
         return ret;
     }
 
+    private static Union epsilon = new Union("()");
+    static { epsilon.add(Sequence.empty); }
 }