tentative checkpoint ROLL THIS BACK BUT INCLUDES CRUCIAL FIX

[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 deea38e..8952536 100644 (file)
--- a/src/edu/berkeley/sbp/chr/CharRange.java
+++ b/src/edu/berkeley/sbp/chr/CharRange.java
@@ -12,9 +12,9 @@ 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;
@@ -27,11 +27,12 @@ public class CharRange extends Atom<Character> {
     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 Union.epsilon;
         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; } };