X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FSequence.java;h=6b615dcd4460f7ffa3a0133474120924e0947294;hp=3ac811e392283b8ed34f15ab6f070a32e2b84f16;hb=5d18f5606c9296e6b0c5749f05fc68f358ace2f6;hpb=1a249057cbfd2180910e46672eafee3af46ae470

diff --git a/src/edu/berkeley/sbp/Sequence.java b/src/edu/berkeley/sbp/Sequence.java
index 3ac811e..6b615dc 100644
--- a/src/edu/berkeley/sbp/Sequence.java
+++ b/src/edu/berkeley/sbp/Sequence.java
@@ -72,12 +72,10 @@ public abstract class Sequence extends Element implements Iterable<Element> {
 
     // DO NOT MESS WITH THE FOLLOWING LINE!!!
     private Forest.Ref epsilonForm = null;
-    private boolean eps = false;
     Forest epsilonForm() {
-        if (epsilonForm==null) {
-            epsilonForm = new Forest.Ref();
-            epsilonForm.merge(firstp().rewrite2(null));
-        }
+        if (epsilonForm!=null) return epsilonForm;
+        epsilonForm = new Forest.Ref();
+        epsilonForm.merge(firstp().rewrite(null, false));
         return epsilonForm;
     }
 
@@ -123,12 +121,9 @@ public abstract class Sequence extends Element implements Iterable<Element> {
 
         // Position /////////////////////////////////////////////////////////////////////////////////
 
-        final <T> Forest<T> rewrite(Input.Location loc) {
-            if (this==firstp()) return epsilonForm();
-            return rewrite2(loc);
-        }
-
-        final <T> Forest<T> rewrite2(Input.Location loc) {
+        final <T> Forest<T> rewrite(Input.Location loc) { return rewrite(loc, true); }
+        private final <T> Forest<T> rewrite(Input.Location loc, boolean epsilonCheck) {
+            if (epsilonCheck && this==firstp()) return epsilonForm();
             for(int i=0; i<pos; i++) if (holder[i]==null) throw new Error("realbad " + i);
             for(int i=pos; i<elements.length; i++) {
                 if (holder[i]==null) holder[i] = elements[i].epsilonForm();