checkpoint

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

diff --git a/src/edu/berkeley/sbp/chr/CharRange.java b/src/edu/berkeley/sbp/chr/CharRange.java
index cac3bbb..78f2057 100644 (file)
--- a/src/edu/berkeley/sbp/chr/CharRange.java
+++ b/src/edu/berkeley/sbp/chr/CharRange.java
@@ -12,26 +12,28 @@ 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(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  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)); }
 
     public String toString() { return t.toString(); }
 
     /** returns an element which exactly matches the string given */
 
     public static Atom set(Range.Set r) { return new CharRange(new CharTopology(r)); }
 
     public String toString() { return t.toString(); }
 
     /** returns an element which exactly matches the string given */

-    public static Element string(String s) {
-        if (s.length() == 0) return Union.epsilon;
+    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\\")+"\"";
         Element ret;
         final String escapified = "\""+StringUtil.escapify(s, "\"\r\n\\")+"\"";
         Element ret;

-        if (s.length() == 1) {
+        if (share && s.length() == 1) {

             ret =
                 new CharRange(s.charAt(0)) {
                     public String toString() { return escapified; } };
             ret =
                 new CharRange(s.charAt(0)) {
                     public String toString() { return escapified; } };

@@ -40,10 +42,12 @@ public class CharRange 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 CharRange(s.charAt(i));
                     public String toString() { return escapified; } };
             Element[] refs = new Element[s.length()];
             for(int i=0; i<refs.length; i++) refs[i] = new CharRange(s.charAt(i));

-            ret2.add(Sequence.constant(refs, s, null, null));
+            ret2.add(Sequence.constant(refs, s));

             ret = ret2;
         }
         return ret;
     }
 
             ret = ret2;
         }
         return ret;
     }
 

+    private static Union epsilon = new Union("()");
+    static { epsilon.add(Sequence.empty); }

 }
 }