X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2Fmisc%2FMetaGrammar.java;h=e4592a84da21baea38c3151752e19696f80fb40b;hb=5d3efb18a5ac20129a699102fa0099b98b558874;hp=b1a3e8ce3bf29c9619b8cbef5e4deff727c6c099;hpb=e214b29e31c1b1594695925eefc1fad411ce7081;p=sbp.git

diff --git a/src/edu/berkeley/sbp/misc/MetaGrammar.java b/src/edu/berkeley/sbp/misc/MetaGrammar.java
index b1a3e8c..e4592a8 100644
--- a/src/edu/berkeley/sbp/misc/MetaGrammar.java
+++ b/src/edu/berkeley/sbp/misc/MetaGrammar.java
@@ -258,26 +258,20 @@ public class MetaGrammar extends StringWalker {
             }
             Element[] expansion = o2;
             Sequence ret = null;
-            if (dropAll || lame) {
-                ret = Sequence.drop(expansion, lame);
-                for(Sequence s : and) ret = ret.and(s);
-                for(Sequence s : not) ret = ret.not(s);
-            }
-            else if (unwrap)    ret = new Sequence.Unwrap(expansion, drops, and, not);
-            else if (tag!=null) ret = Sequence.rewritingSequence(tag, expansion, drops, and, not);
+            if (dropAll || lame) ret = Sequence.drop(expansion, lame);
+            else if (unwrap)    ret = new Sequence.Unwrap(expansion, drops);
+            else if (tag!=null) ret = Sequence.rewritingSequence(tag, expansion, drops);
             else {
                 int idx = -1;
                 for(int i=0; i<expansion.length; i++)
                     if (!drops[i])
                         if (idx==-1) idx = i;
                         else throw new Error("multiple non-dropped elements in sequence: " + Sequence.drop(expansion,false));
-                if (idx != -1) ret = Sequence.singleton(expansion, idx, and, not);
-                else           {
-                    ret = Sequence.drop(expansion, false);
-                    for(Sequence s : and) ret = ret.and(s);
-                    for(Sequence s : not) ret = ret.not(s);
-                }
+                if (idx != -1) ret = Sequence.singleton(expansion, idx);
+                else           ret = Sequence.drop(expansion, false);
             }
+            for(Sequence s : and) ret = ret.and(s);
+            for(Sequence s : not) ret = ret.not(s);
             set.add(ret);
             if (this.noFollow != null) ret.noFollow = new Atom.Invert(new Atom.Infer(this.noFollow));
             return ret;