X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2Fchr%2FCharAtom.java;h=45c85b95a1ca94c7af6f891a2b0746d216db94d0;hb=8ed318cb9c9f27861adf519522cbe9d95f094dab;hp=f05c3452658525771a11a7fa2a4cb064d674f434;hpb=3ee451bce342d4bb61ad6235ba57bdf817bfdd1a;p=sbp.git

diff --git a/src/edu/berkeley/sbp/chr/CharAtom.java b/src/edu/berkeley/sbp/chr/CharAtom.java
index f05c345..45c85b9 100644
--- a/src/edu/berkeley/sbp/chr/CharAtom.java
+++ b/src/edu/berkeley/sbp/chr/CharAtom.java
@@ -23,9 +23,9 @@ public class CharAtom extends Atom<Character> {
 
     public static final char left       = (char)9998;
     public static final char right      = (char)9999;
-    public static final Atom leftBrace  = new CharAtom(left,left)   { public String toString() { return "[{]"; } };
-    public static final Atom rightBrace = new CharAtom(right,right) { public String toString() { return "[}]"; } };
-    public static final Atom braces     = new CharAtom(left,right)   { public String toString() { return "[{}]"; } };
+    public static final Atom leftBrace  = new CharAtom(left,left)   { public String toString() { return "\\{"; } };
+    public static final Atom rightBrace = new CharAtom(right,right) { public String toString() { return "\\}"; } };
+    public static final Atom braces     = new CharAtom(left,right)   { public String toString() { return "[\\{\\}]"; } };
 
     public static Atom set(Range.Set r) { return new CharAtom(new CharTopology(r)); }
     public String toString() { return t.toString(); }
@@ -33,7 +33,7 @@ public class CharAtom 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 epsilon;
+        if (share && s.length() == 0) return emptyString;
         final String escapified = "\""+StringUtil.escapify(s, "\"\r\n\\")+"\"";
         Element ret;
         if (share && s.length() == 1) {
@@ -51,8 +51,11 @@ public class CharAtom extends Atom<Character> {
         return ret;
     }
 
-    private static Union epsilon = new Union("()");
-    static { epsilon.add(Sequence.create()); }
+    private static Union emptyString = new Union("()");
+    static {
+        // FIXME: force this to be dropped wherever used!
+        emptyString.add(Sequence.create(new Element[0], ""));
+    }
 
     public Topology<Atom<Character>>       unwrap() { return this; }
     public Topology<Atom<Character>>       empty()  { return new CharAtom(); }