checkpoint

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

diff --git a/src/edu/berkeley/sbp/meta/Grammar.java b/src/edu/berkeley/sbp/meta/Grammar.java
index d9462e0..ad96a5f 100644 (file)
--- 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);
         }
     }