checkpoint

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

diff --git a/src/edu/berkeley/sbp/chr/CharRange.java b/src/edu/berkeley/sbp/chr/CharAtom.java
similarity index 63%
rename from src/edu/berkeley/sbp/chr/CharRange.java
rename to src/edu/berkeley/sbp/chr/CharAtom.java
index 78f2057..c0df627 100644 (file)
--- a/src/edu/berkeley/sbp/chr/CharRange.java
+++ b/src/edu/berkeley/sbp/chr/CharAtom.java
@@ -8,22 +8,22 @@ import edu.berkeley.sbp.util.*;
 import edu.berkeley.sbp.misc.*;
 import edu.berkeley.sbp.Input.Location;
 
-public class CharRange extends Atom<Character> {
+public class CharAtom extends Atom<Character> {
 
-    public CharRange(char a) { this(a,a); }
-    public CharRange(char a, char b) { this(new CharTopology(a, b)); }
-    public CharRange(CharTopology t) { this.t = t; }
+    public CharAtom(char a) { this(a,a); }
+    public CharAtom(char a, char b) { this(new CharTopology(a, b)); }
+    public CharAtom(CharTopology t) { this.t = 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 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 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 CharRange(new CharTopology(r)); }
+    public static Atom set(Range.Set r) { return new CharAtom(new CharTopology(r)); }
 
     public String toString() { return t.toString(); }
 
@@ -35,13 +35,13 @@ public class CharRange extends Atom<Character> {
         Element ret;
         if (share && s.length() == 1) {
             ret =
-                new CharRange(s.charAt(0)) {
+                new CharAtom(s.charAt(0)) {
                     public String toString() { return escapified; } };
         } else {
             Union ret2 = new Union("\""+s+"\"_str", true) {
                     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));
+            for(int i=0; i<refs.length; i++) refs[i] = new CharAtom(s.charAt(i));
             ret2.add(Sequence.constant(refs, s));
             ret = ret2;
         }