minor cleanups to CharInput

darcs-hash:20070326053742-5007d-8819a00bc26b3f0011ff7c83a0c82b57a2676f6b.gz

diff --git a/src/edu/berkeley/sbp/chr/CharAtom.java b/src/edu/berkeley/sbp/chr/CharAtom.java
index c729b54..45c85b9 100644 (file)
--- a/src/edu/berkeley/sbp/chr/CharAtom.java
+++ b/src/edu/berkeley/sbp/chr/CharAtom.java
@@ -33,7 +33,7 @@ public class CharAtom extends Atom<Character> {
     /** returns an element which exactly matches the string given */
     public static Element string(String s) { return string(s, true); }
     public static Element string(String s, boolean share) {
-        if (share && s.length() == 0) return epsilon;
+        if (share && s.length() == 0) return emptyString;
         final String escapified = "\""+StringUtil.escapify(s, "\"\r\n\\")+"\"";
         Element ret;
         if (share && s.length() == 1) {
@@ -51,8 +51,11 @@ public class CharAtom extends Atom<Character> {
         return ret;
     }
 
-    private static Union epsilon = new Union("()");
-    static { epsilon.add(Sequence.create()); }
+    private static Union emptyString = new Union("()");
+    static {
+        // FIXME: force this to be dropped wherever used!
+        emptyString.add(Sequence.create(new Element[0], ""));
+    }
 
     public Topology<Atom<Character>>       unwrap() { return this; }
     public Topology<Atom<Character>>       empty()  { return new CharAtom(); }

diff --git a/src/edu/berkeley/sbp/chr/CharInput.java b/src/edu/berkeley/sbp/chr/CharInput.java
index 95609bc..2e8e882 100644 (file)
--- a/src/edu/berkeley/sbp/chr/CharInput.java
+++ b/src/edu/berkeley/sbp/chr/CharInput.java
@@ -102,10 +102,8 @@ public class CharInput extends Cartesian.Input<Character> {
 
         int i = r.read();
         if (i==-1) {
-            /*System.err.print("\r...done       \r"); */
             if (indent && indentation >= 0) {
                 redent(indentation - lastIndentation);
-                //System.err.println("\r                   \rindent: " + (indentation - lastIndentation));
                 lastIndentation = indentation;
                 indentation = -1;
                 return __next();