intermediate checkpoint

[sbp.git] / src / edu / berkeley / sbp / Sequence.java

diff --git a/src/edu/berkeley/sbp/Sequence.java b/src/edu/berkeley/sbp/Sequence.java
index 065150c..610af58 100644 (file)
--- a/src/edu/berkeley/sbp/Sequence.java
+++ b/src/edu/berkeley/sbp/Sequence.java
@@ -51,7 +51,7 @@ public abstract class Sequence extends Element implements Iterable<Element> {
           HashSet<Sequence> hated;
     final HashSet<Sequence> needs;
     final HashSet<Sequence> hates;
           HashSet<Sequence> hated;
     final HashSet<Sequence> needs;
     final HashSet<Sequence> hates;

-          boolean           lame  = false;
+    public boolean           lame  = false;

 
     final Position          firstp;
     Position firstp() { return firstp; }
 
     final Position          firstp;
     Position firstp() { return firstp; }

@@ -76,8 +76,7 @@ public abstract class Sequence extends Element implements Iterable<Element> {
     Forest epsilonForm() {
         if (epsilonForm==null) {
             epsilonForm = new Forest.Ref();
     Forest epsilonForm() {
         if (epsilonForm==null) {
             epsilonForm = new Forest.Ref();

-            Forest fo = firstp().rewrite(null);
-            epsilonForm.merge(fo);
+            epsilonForm.merge(firstp().rewrite2(null));

         }
         return epsilonForm;
     }
         }
         return epsilonForm;
     }

@@ -122,8 +121,11 @@ public abstract class Sequence extends Element implements Iterable<Element> {
         // Reduction /////////////////////////////////////////////////////////////////////////////////
 
         final <T> Forest<T> rewrite(Token.Location loc) {
         // Reduction /////////////////////////////////////////////////////////////////////////////////
 
         final <T> Forest<T> rewrite(Token.Location loc) {

-            if (this==firstp() && eps) return epsilonForm;
-            eps = true;
+            if (this==firstp()) return epsilonForm();
+            return rewrite2(loc);
+        }
+
+        final <T> Forest<T> rewrite2(Token.Location loc) {

             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();
             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();

@@ -131,7 +133,6 @@ public abstract class Sequence extends Element implements Iterable<Element> {
             }
             Forest<T> ret = Sequence.this.postReduce(loc, holder);
             for(int k=0; k<pos; k++) holder[k] = null; // to help GC
             }
             Forest<T> ret = Sequence.this.postReduce(loc, holder);
             for(int k=0; k<pos; k++) holder[k] = null; // to help GC

-            if (this==firstp()) { if (epsilonForm==null) epsilonForm=new Forest.Ref(); epsilonForm.merge(ret); return epsilonForm; }

             return ret;
         }
 
             return ret;
         }