X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2Fchr%2FCharAtom.java;h=3206269180193dafcb3bfdb317d23d7487a3b185;hb=24219bdf084b45273e869cd19382d1640b396566;hp=1d76aa7c7e3179f7637893ccb66586062ef1d38b;hpb=75d0fa39d405292f4b831a6d1743f2aeea01ebd4;p=sbp.git

diff --git a/src/edu/berkeley/sbp/chr/CharAtom.java b/src/edu/berkeley/sbp/chr/CharAtom.java
index 1d76aa7..3206269 100644
--- a/src/edu/berkeley/sbp/chr/CharAtom.java
+++ b/src/edu/berkeley/sbp/chr/CharAtom.java
@@ -1,3 +1,5 @@
+// Copyright 2006-2007 all rights reserved; see LICENSE file for BSD-style license
+
 package edu.berkeley.sbp.chr;
 import java.io.*;
 import java.util.*;
@@ -21,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(); }
@@ -31,8 +33,8 @@ 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;
-        final String escapified = "\""+StringUtil.escapify(s, "\"\r\n\\")+"\"";
+        if (share && s.length() == 0) return emptyString;
+        final String escapified = "\""+StringUtil.escapify(s, "\"\r\t\n\\")+"\"";
         Element ret;
         if (share && s.length() == 1) {
             ret =
@@ -43,14 +45,17 @@ 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;
     }
 
-    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(); }