X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FSequence.java;h=9f2fb59249c7f6890d36909a7bd912a494e665fd;hp=b33279352a9a6b61c4cfd4bfa3e29629c3670e6f;hb=9ded11559a1b6f817e99355b1c9e2c88042e91d4;hpb=84a4a8204373b996105e69edf91d2f9fae7b4bcb

diff --git a/src/edu/berkeley/sbp/Sequence.java b/src/edu/berkeley/sbp/Sequence.java
index b332793..9f2fb59 100644
--- a/src/edu/berkeley/sbp/Sequence.java
+++ b/src/edu/berkeley/sbp/Sequence.java
@@ -56,13 +56,21 @@ public abstract class Sequence extends Element implements Iterable<Element> {
     protected Sequence(Element[] elements, HashSet<Sequence> and, HashSet<Sequence> not) {
         this.needs = and==null ? new HashSet<Sequence>() : and;
         this.hates = not==null ? new HashSet<Sequence>() : not;
-        //for(Sequence s : needs) s.lame = true;
-        //for(Sequence s : hates) s.lame = true;
         this.elements = elements;
         this.firstp = new Position(0);
     }
 
-    Forest epsilonForm() { return firstp().rewrite(null); }
+    // 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();
+            Forest fo = firstp().rewrite(null);
+            epsilonForm.merge(fo);
+        }
+        return epsilonForm;
+    }
 
     protected abstract <T> Forest<T> postReduce(Token.Location loc, Forest<T>[] args);
 
@@ -103,10 +111,17 @@ public abstract class Sequence extends Element implements Iterable<Element> {
 
         // Reduction /////////////////////////////////////////////////////////////////////////////////
 
-        <T> Forest<T> rewrite(Token.Location loc) {
-            for(int i=pos; i<elements.length; i++) if (holder[i]==null) holder[i] = elements[i].epsilonForm();
+        final <T> Forest<T> rewrite(Token.Location loc) {
+            if (this==firstp() && eps) return epsilonForm;
+            eps = true;
+            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();
+                if (holder[i]==null) throw new Error("bad " + i);
+            }
             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;
         }
 
@@ -162,11 +177,12 @@ public abstract class Sequence extends Element implements Iterable<Element> {
         public <T> Forest<T> postReduce(Token.Location loc, Forest<T>[] args) { return (Forest<T>)Forest.singleton(loc, args[idx], this); }
     }
 
-    static class Unwrap extends Sequence {
+    public static class Unwrap extends Sequence {
         private boolean[] drops;
         public Unwrap(Element[] e, HashSet<Sequence> and, HashSet<Sequence> not)                  { super(e, and, not); this.drops = null; }
         public Unwrap(Element[] e, boolean[] drops, HashSet<Sequence> and, HashSet<Sequence> not) { super(e, and, not); this.drops = drops; }
         public <T> Forest<T> postReduce(Token.Location loc, Forest<T>[] args) {
+            for(int i=0; i<args.length; i++) if (args[i]==null) throw new Error();
             if (drops==null) return Forest.create(loc, null, args, this, true, false);
             int count = 0;
             for(int i=0; i<drops.length; i++) if (!drops[i]) count++;
@@ -178,7 +194,7 @@ public abstract class Sequence extends Element implements Iterable<Element> {
     }
 
     static class RewritingSequence extends Sequence {
-        private final Object tag;
+        /*private*/public final Object tag;
         private final boolean[] drops;
         private int count = 0;
         public RewritingSequence(Object tag, Element[] e, HashSet<Sequence> and, HashSet<Sequence> not) { this(tag, e, null, and, not); }
@@ -192,6 +208,7 @@ public abstract class Sequence extends Element implements Iterable<Element> {
             Forest<T>[] args2 = new Forest[count];
             int j = 0;
             for(int i=0; i<args.length; i++) if (!drops[i]) args2[j++] = args[i];
+            //System.out.println("reduce \""+tag+"\"");
             return Forest.create(loc, (T)tag, args2, this, false, false);
         }
         public StringBuffer toString(StringBuffer sb, boolean spacing) {