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=eafe88230ddefd5ac5b79a3413c91b667359dda2;hp=49d4deaec7e573a9d88a64a9c9d913cedeef9362;hb=61a641445b4f0916427804a6168b87fcde977abf;hpb=6f64b93b77bf4fe170bed9d9750469e903e34093
diff --git a/src/edu/berkeley/sbp/misc/CharToken.java b/src/edu/berkeley/sbp/misc/CharToken.java
index 49d4dea..eafe882 100644
--- a/src/edu/berkeley/sbp/misc/CharToken.java
+++ b/src/edu/berkeley/sbp/misc/CharToken.java
@@ -10,15 +10,11 @@ import edu.berkeley.sbp.util.*;
/** an implementation of Token for streams of Java char values */
public class CharToken implements IntegerMappable {
- public static final Atom leftBrace = new CharRange(new IntegerTopology(9998)) { public String toString() { return "{"; } };
- public static final Atom rightBrace = new CharRange(new IntegerTopology(9999)) { public String toString() { return "}"; } };
+ public static final Atom leftBrace = new CharRange(new IntegerTopology(null, 9998)) { public String toString() { return "{"; } };
+ public static final Atom rightBrace = new CharRange(new IntegerTopology(null, 9999)) { public String toString() { return "}"; } };
public static final CharToken left = new CharToken((char)9998);
public static final CharToken right = new CharToken((char)9999);
- 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());
-
// Private //////////////////////////////////////////////////////////////////////////////
public final char c;
@@ -30,24 +26,4 @@ public class CharToken implements IntegerMappable {
public int toInt() { return (int)c; }
- public static class Stream extends CartesianInput {
- private final Reader r;
-
- public Stream(String s) { this(new StringReader(s)); }
- public Stream(Reader r) { this(r, null); }
- public Stream(Reader r, String s) { this.r = r; }
- public Stream(InputStream i) { this(i, null); }
- public Stream(InputStream i, String s) { this(new InputStreamReader(i), s); }
-
- boolean cr = false;
- public boolean isCR() { return cr; }
- public CharToken next() throws IOException {
- cr = false;
- int i = r.read();
- if (i==-1) return null;
- char c = (char)i;
- cr = c=='\n';
- return new CharToken(c);
- }
- }
}