checkpoint

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

diff --git a/src/edu/berkeley/sbp/misc/CharRange.java b/src/edu/berkeley/sbp/misc/CharRange.java
index 5a1c24c..18f89a0 100644 (file)
--- a/src/edu/berkeley/sbp/misc/CharRange.java
+++ b/src/edu/berkeley/sbp/misc/CharRange.java
@@ -7,11 +7,11 @@ import edu.berkeley.sbp.*;
 import edu.berkeley.sbp.Token.Location;
 import edu.berkeley.sbp.util.*;
 
-public class CharRange extends Atom<CharToken> {
+public class CharRange extends Atom<Character> {
     private String esc(char c) { return StringUtil.escapify(c+"", "[]-~\\\"\'"); }
-    private Topology<CharToken> t;
-    public CharRange(Topology<CharToken> t) { this.t = t; }
-    public Topology<CharToken> top() { return t; }
+    private Topology<Character> t;
+    public CharRange(Topology<Character> t) { this.t = t; }
+    public Topology<Character> top() { return t; }
     public String toString() {
         StringBuffer sb = new StringBuffer();
         sb.append('[');
@@ -36,7 +36,7 @@ public class CharRange extends Atom<CharToken> {
     }
     public static final Atom leftBrace  = CharToken.leftBrace;
     public static final Atom rightBrace = CharToken.rightBrace;
-    public static Atom set(Range.Set r) { return new CharRange(new IntegerTopology<CharToken>(CharToken.c2i, r)); }
+    public static Atom set(Range.Set r) { return new CharRange(new IntegerTopology<Character>(CharToken.c2i, r)); }
     private static final Range.Set all = new Range.Set(new Range(0, Character.MAX_VALUE));
 
     /** returns an element which exactly matches the string given */
@@ -46,13 +46,13 @@ public class CharRange extends Atom<CharToken> {
         Element ret;
         if (s.length() == 1) {
             ret =
-                new CharRange(new IntegerTopology<CharToken>(CharToken.c2i, (int)s.charAt(0))) {
+                new CharRange(new IntegerTopology<Character>(CharToken.c2i, (int)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(new IntegerTopology<CharToken>(CharToken.c2i, (int)s.charAt(i)));
+            for(int i=0; i<refs.length; i++) refs[i] = new CharRange(new IntegerTopology<Character>(CharToken.c2i, (int)s.charAt(i)));
             ret2.add(Sequence.constant(refs, s, null, null));
             ret = ret2;
         }