X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2Fmisc%2FCharToken.java;fp=src%2Fedu%2Fberkeley%2Fsbp%2Fmisc%2FCharToken.java;h=51ffc9a8219635bf67e15565ec6171be902172fd;hp=a8ebafc8c79b90ed80603818a5a09eefb06dc1c6;hb=cb3cb8cadee03c8b89726edf1e634e4cab59c952;hpb=d1504e1e7993703832063cf6bff6ead434b2fd17
diff --git a/src/edu/berkeley/sbp/misc/CharToken.java b/src/edu/berkeley/sbp/misc/CharToken.java
index a8ebafc..51ffc9a 100644
--- a/src/edu/berkeley/sbp/misc/CharToken.java
+++ b/src/edu/berkeley/sbp/misc/CharToken.java
@@ -10,35 +10,6 @@ import edu.berkeley.sbp.util.*;
/** an implementation of Token for streams of Java char values */
public class CharToken implements IntegerMappable {
- public static class CharRange extends Atom {
- private String esc(char c) { return StringUtil.escapify(c+"", "[]-~\\\"\'"); }
- private Topology t;
- public CharRange(Topology t) { this.t = t; }
- public Topology top() { return t; }
- public String toString() {
- StringBuffer sb = new StringBuffer();
- sb.append('[');
- Range.Set ranges = ((IntegerTopology)top()).getRanges();
- if (ranges.size() == -1 || ranges.size() > Character.MAX_VALUE/2) {
- sb.append('~');
- ranges = ranges.complement();
- }
- ranges = ranges.intersect(all);
- for(Range r : ranges) {
- if (r.isMinNegInf() || r.isMaxPosInf()) throw new Error("should not happen");
- if (r.getMin()==r.getMax()) {
- sb.append(esc((char)r.getMin()));
- } else{
- sb.append(esc((char)r.getMin()));
- sb.append('-');
- sb.append(esc((char)r.getMax()));
- }
- }
- sb.append(']');
- return sb.toString();
- }
- }
-
/** returns an element matching all characters between start and end, inclusive */
public static Atom positiveRange(char start, char end) {
return new CharRange(new IntegerTopology(new Range.Set(new Range((int)start, (int)end))));
@@ -53,8 +24,8 @@ public class CharToken implements IntegerMappable {
public static final Atom rightBrace = new CharRange(new IntegerTopology(9999)) { public String toString() { return "}"; } };
public static final CharToken left = new CharToken((char)9998);
public static final CharToken right = new CharToken((char)9999);
-
- private static final Range.Set all = new Range.Set(new Range(0, Character.MAX_VALUE));
+
+ static final Range.Set all = new Range.Set(new Range(0, Character.MAX_VALUE));
public static final Atom any = new CharRange(new IntegerTopology(all));
public static final Atom none = new CharRange(new IntegerTopology());
public static IntegerTopology range(Range r) { return new IntegerTopology(r); }