allow lifts on any position

[sbp.git] / src / edu / berkeley / sbp / chr / CharAtom.java

diff --git a/src/edu/berkeley/sbp/chr/CharAtom.java b/src/edu/berkeley/sbp/chr/CharAtom.java
index 45c85b9..f0b7a9e 100644 (file)
--- 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(); }
@@ -45,7 +45,7 @@ public class CharAtom extends Atom<Character> {
                     public String toString() { return escapified; } };
             Element[] refs = new Element[s.length()];
             for(int i=0; i<refs.length; i++) refs[i] = new CharAtom(s.charAt(i));
-            ret2.add(Sequence.create(refs, s));
+            ret2.add(Sequence.create(s, refs));
             ret = ret2;
         }
         return ret;
@@ -54,7 +54,7 @@ public class CharAtom extends Atom<Character> {
     private static Union emptyString = new Union("()");
     static {
         // FIXME: force this to be dropped wherever used!
-        emptyString.add(Sequence.create(new Element[0], ""));
+        emptyString.add(Sequence.create("", new Element[0]));
     }
 
     public Topology<Atom<Character>>       unwrap() { return this; }