From: adam <adam@megacz.com>
Date: Wed, 14 Dec 2005 07:09:37 +0000 (-0500)
Subject: checkpoint
X-Git-Tag: tag_for_25-Mar~541
X-Git-Url: http://git.megacz.com/?p=sbp.git;a=commitdiff_plain;h=3485f1c89ae352b5aa1b65cdfa5f628cd3859601;hp=ea6309dcafef2c5796be4c1d50c8295274dc31d6

checkpoint

darcs-hash:20051214070937-5007d-02216af23f82897012b680aac4fc45132f721a4c.gz
---

diff --git a/src/edu/berkeley/sbp/misc/MetaGrammar.java b/src/edu/berkeley/sbp/misc/MetaGrammar.java
index d5fa65d..53aeff0 100644
--- a/src/edu/berkeley/sbp/misc/MetaGrammar.java
+++ b/src/edu/berkeley/sbp/misc/MetaGrammar.java
@@ -144,25 +144,6 @@ public class MetaGrammar extends ReflectiveWalker {
         public PreSequence(Object[] o, String tag) { this(o, tag, false); }
         public PreSequence(Object[] o, String tag, boolean keeper) { this.o = o; this.tag = tag; this.keeper = keeper; }
         boolean[] drops = null;
-        public Element[] expand(Union u, HashSet<Sequence> set) {
-            if (o==null) return new Element[0];
-            Element[] o2 = new Element[o.length];
-            drops = new boolean[o.length];
-            int j = 0;
-            for(int i=0; i<o.length; i++) {
-                Object oi = o[i];
-                if (oi instanceof MyDrop)      { oi = ((MyDrop)oi).o; drops[j] = true; }
-                if (oi==SELF)                    o2[j] = u.new Subset("(("+u+"))", set);
-                else if (oi instanceof MyLift) { o2[j] = CharToken.string(tag = ((MyLift)oi).s); drops[j] = true; }
-                else                             o2[j] = (Element)oi;
-
-                if (dropAll.contains(o2[j])) drops[j] = true;
-
-                o2[j] = o2[j];
-                j++;
-            }
-            return o2;
-        }
         public Union    buildUnion() {
             Union u = new Union("???");
             u.add(buildSequence(u));
@@ -173,7 +154,22 @@ public class MetaGrammar extends ReflectiveWalker {
             for(Sequence s : and) u.add(s);
             for(Sequence s : not) u.add(s);
             HashSet<Sequence> set = new HashSet<Sequence>();
-            Element[] expansion = expand(u, set);
+            Element[] o2 = o==null ? new Element[0] : new Element[o.length];
+            if (o != null) {
+                drops = new boolean[o.length];
+                int j = 0;
+                for(int i=0; i<o.length; i++) {
+                    Object oi = o[i];
+                    if (oi instanceof MyDrop)      { oi = ((MyDrop)oi).o; drops[j] = true; }
+                    if (oi==SELF)                    o2[j] = u.new Subset("(("+u+"))", set);
+                    else if (oi instanceof MyLift) { o2[j] = CharToken.string(tag = ((MyLift)oi).s); drops[j] = true; }
+                    else                             o2[j] = (Element)oi;
+                    if (MetaGrammar.dropAll.contains(o2[j])) drops[j] = true;
+                    o2[j] = o2[j];
+                    j++;
+                }
+            }
+            Element[] expansion = o2;
             boolean keeper = this.keeper;
             Sequence ret = dropAll || lame || keeper ? Sequence.drop(expansion, and, not, lame) : null;
             if (ret==null && tag!=null) {