checkpoint

[sbp.git] / src / edu / berkeley / sbp / meta / MetaGrammarBindings.java

diff --git a/src/edu/berkeley/sbp/meta/MetaGrammarBindings.java b/src/edu/berkeley/sbp/meta/MetaGrammarBindings.java
index 7a18bab..00d4aa4 100644 (file)
--- a/src/edu/berkeley/sbp/meta/MetaGrammarBindings.java
+++ b/src/edu/berkeley/sbp/meta/MetaGrammarBindings.java
@@ -82,7 +82,7 @@ public class MetaGrammarBindings extends AnnotationGrammarBindings {
                 }
                 if (sequences.length==1) break;
                 Sequence seq = Sequence.create(u2);
-                for(Sequence s : bad2) seq = seq.not(s);
+                for(Sequence s : bad2) seq = seq.andnot(s);
                 u.add(seq);
                 bad2.add(Sequence.create(u2));
             }
@@ -149,7 +149,7 @@ public class MetaGrammarBindings extends AnnotationGrammarBindings {
                 }
                 if (sequences.length==1) break;
                 Sequence seq = Sequence.create(u2);
-                for(Sequence s : bad2) seq = seq.not(s);
+                for(Sequence s : bad2) seq = seq.andnot(s);
                 u.add(seq);
                 bad2.add(Sequence.create(u2));
             }
@@ -225,7 +225,7 @@ public class MetaGrammarBindings extends AnnotationGrammarBindings {
         public Sequence build(Context cx, Union u, NonTerminalNode cnt) {
             Sequence ret = build0(cx, cnt);
             for(Seq s : and) { Sequence dork = s.build(cx, u, cnt); ret = ret.and(dork); }
-            for(Seq s : not) { Sequence dork = s.build(cx, u, cnt); ret = ret.not(dork); }
+            for(Seq s : not) { Sequence dork = s.build(cx, u, cnt); ret = ret.andnot(dork); }
             u.add(ret);
             return ret;
         }
@@ -246,9 +246,9 @@ public class MetaGrammarBindings extends AnnotationGrammarBindings {
                 for(int i=0; i<els.length; i++)
                     if (!drops[i])
                         if (idx==-1) idx = i;
-                        else throw new Error("multiple non-dropped elements in sequence: " + Sequence.newConstantSequence(els, null));
+                        else throw new Error("multiple non-dropped elements in sequence: " + Sequence.create(els, null));
                 if (idx != -1) ret = Sequence.create(els, idx);
-                else           ret = Sequence.newConstantSequence(els, null);
+                else           ret = Sequence.create(els, null);
             }
             if (this.follow != null)
                 ret = ret.followedBy(this.follow.toAtom(cx));