X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2Fmeta%2FGrammar.java;h=ad96a5f88379e1650ddb64b53dd00b481557ae9c;hp=d9462e07f1f95728fd95cd04e2de8295e5bac7c5;hb=4378d20232cd88fb2a57edc5a5114f952ab58a18;hpb=52a3b053b79694ac0b714c4853c870cfe33a1ed1

diff --git a/src/edu/berkeley/sbp/meta/Grammar.java b/src/edu/berkeley/sbp/meta/Grammar.java
index d9462e0..ad96a5f 100644
--- a/src/edu/berkeley/sbp/meta/Grammar.java
+++ b/src/edu/berkeley/sbp/meta/Grammar.java
@@ -19,7 +19,7 @@ public class Grammar {
      *  @param gbr a GrammarBindingResolver that resolves grammatical reductions into tree-node-heads
      */
     public static Union create(Tree t, String s, Grammar.Bindings gbr) {
-        Tree.TreeFunctor<Object,Object> red = (Tree.TreeFunctor<Object,Object>)t.head();
+        TreeFunctor<Object,Object> red = (TreeFunctor<Object,Object>)t.head();
         MetaGrammarBindings.GrammarNode g = (MetaGrammarBindings.GrammarNode)red.invoke(t.children());
         return g.build(s, gbr);
     }
@@ -28,7 +28,7 @@ public class Grammar {
         public Object repeatTag()                   { return null; }
         public Sequence createSequence(Production p) {
             if (p.tag==null) return null;
-            return Sequence.rewritingSequence(p.tag, p.elements, p.drops);
+            return Sequence.newRewritingSequence(p.tag, p.elements, p.drops);
         }
     }