X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FSequence.java;h=e09ff720a3cab47f5356130662b5b04ef164bf91;hb=03f91bd299c8c8724fe966f527b7410d2cea675d;hp=a75bafa008243da5b7f83fd045e8362002e1af5d;hpb=6ae224025882c9929e2e4e9e8461decbf3b9cae4;p=sbp.git

diff --git a/src/edu/berkeley/sbp/Sequence.java b/src/edu/berkeley/sbp/Sequence.java
index a75bafa..e09ff72 100644
--- a/src/edu/berkeley/sbp/Sequence.java
+++ b/src/edu/berkeley/sbp/Sequence.java
@@ -18,6 +18,7 @@ public abstract class Sequence extends Element implements Iterable<Element> {
         for(Sequence s : needs) { ret.needs.add(s); s.needed.add(ret); }
         for(Sequence s : hates) { ret.hates.add(s); s.hated.add(ret); }
         ret.follow = follow;
+        ret.lame = lame;
         return ret;
     }
 
@@ -38,7 +39,8 @@ public abstract class Sequence extends Element implements Iterable<Element> {
      *  after matching the sequence, create the specified output tree
      *  @param tag   the tag for the output tree
      *  @param e     the elements to match
-     *  @param drops only elements of <tt>e</tt> whose corresponding <tt>boolean</tt> in <tt>drops</tt> is <i>false</i> will be included in the output tree
+     *  @param drops only elements of <tt>e</tt> whose corresponding <tt>boolean</tt> in <tt>drops</tt>
+     *               is <i>false</i> will be included in the output tree
      **/
     public static Sequence rewritingSequence(Object tag, Element[] e, Object[] labs, boolean[] drops) {
         return new RewritingSequence(tag, e, labs, drops); }
@@ -49,7 +51,8 @@ public abstract class Sequence extends Element implements Iterable<Element> {
     public final Topology follow() { return follow==null ? null : Atom.toAtom(follow); }
 
     Topology toAtom() {
-        if (elements.length!=1) throw new RuntimeException("cannot invoke toAtom() on a Sequence with " + elements.length + " elements: " + this);
+        if (elements.length!=1)
+            throw new RuntimeException("cannot invoke toAtom() on a Sequence with " + elements.length + " elements: " + this);
         return Atom.toAtom(elements[0]);
     }
 
@@ -59,9 +62,9 @@ public abstract class Sequence extends Element implements Iterable<Element> {
     protected final Element[] elements;
 
     final HashSet<Sequence> needed = new HashSet<Sequence>();
-    final HashSet<Sequence> hated = new HashSet<Sequence>();
-    final HashSet<Sequence> needs = new HashSet<Sequence>();
-    final HashSet<Sequence> hates = new HashSet<Sequence>();
+    final HashSet<Sequence> hated  = new HashSet<Sequence>();
+    final HashSet<Sequence> needs  = new HashSet<Sequence>();
+    final HashSet<Sequence> hates  = new HashSet<Sequence>();
     public boolean           lame  = false;
 
     final Position          firstp;
@@ -133,7 +136,7 @@ public abstract class Sequence extends Element implements Iterable<Element> {
                 if (holder[i]==null) throw new Error("bad " + i);
             }
             Forest<T> ret = Sequence.this.postReduce(loc, holder, this);
-            for(int k=0; k<pos; k++) holder[k] = null; // to help GC
+            //for(int k=0; k<pos; k++) holder[k] = null; // to help GC
             return ret;
         }