checkpoint

darcs-hash:20060115085518-5007d-727ac5a95a591c726f90ec19400823c9017ed116.gz

diff --git a/src/edu/berkeley/sbp/misc/CharRange.java b/src/edu/berkeley/sbp/misc/CharRange.java
new file mode 100644 (file)
index 0000000..41aad06
--- /dev/null
+++ b/src/edu/berkeley/sbp/misc/CharRange.java
@@ -0,0 +1,37 @@
+package edu.berkeley.sbp.misc;
+import java.io.*;
+import java.util.*;
+import java.lang.reflect.*;
+import java.lang.ref.*;
+import edu.berkeley.sbp.*;
+import edu.berkeley.sbp.Token.Location;
+import edu.berkeley.sbp.util.*;
+
+public class CharRange extends Atom<CharToken> {
+    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; }
+    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(CharToken.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();
+    }
+}

diff --git a/src/edu/berkeley/sbp/misc/CharToStringParser.java b/src/edu/berkeley/sbp/misc/CharToStringParser.java
new file mode 100644 (file)
index 0000000..4dae33b
--- /dev/null
+++ b/src/edu/berkeley/sbp/misc/CharToStringParser.java
@@ -0,0 +1,18 @@
+package edu.berkeley.sbp.misc;
+import java.io.*;
+import java.util.*;
+import java.lang.reflect.*;
+import java.lang.ref.*;
+import edu.berkeley.sbp.*;
+import edu.berkeley.sbp.Token.Location;
+import edu.berkeley.sbp.util.*;
+
+public class CharToStringParser extends Parser<CharToken,String> {
+    public CharToStringParser(Union u) { super(u, new IntegerTopology<CharToken>()); }
+    public Forest<String> parse(InputStream is) throws IOException, ParseFailed {
+        return super.parse(new CharToken.Stream(is));
+    }
+    public Forest<String> shiftToken(CharToken ct, Location loc) {
+        return Forest.create(loc, ct.result(), null, false, false);
+    }
+}

diff --git a/src/edu/berkeley/sbp/misc/CharToken.java b/src/edu/berkeley/sbp/misc/CharToken.java
index a8ebafc..51ffc9a 100644 (file)
--- 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 <tt>char</tt> values */
 public class CharToken implements IntegerMappable {
 
-    public static class CharRange extends Atom<CharToken> {
-        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; }
-        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 <tt>start</tt> and <tt>end</tt>, inclusive */
     public static Atom positiveRange(char start, char end) {
         return new CharRange(new IntegerTopology<CharToken>(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<CharToken>(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<CharToken>(all));
     public  static final Atom     none = new CharRange(new IntegerTopology<CharToken>());
     public static IntegerTopology<CharToken> range(Range r) { return new IntegerTopology<CharToken>(r); }