X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2Fmeta%2FGrammar.java;h=a80ac28db0144c3a81619cf908115b5defe63338;hb=b8a597c8d1a29afc24f9b89f726d5b1a9b9aeec1;hp=531105ecf89f3b9bdf35c23fcd1957d52884e5e6;hpb=b1a5513197f7c776706fd5b5618574906f72b707;p=sbp.git

diff --git a/src/edu/berkeley/sbp/meta/Grammar.java b/src/edu/berkeley/sbp/meta/Grammar.java
index 531105e..a80ac28 100644
--- a/src/edu/berkeley/sbp/meta/Grammar.java
+++ b/src/edu/berkeley/sbp/meta/Grammar.java
@@ -12,16 +12,6 @@ import java.io.*;
 public class Grammar {
 
     /**
-     *  Create a grammar from a parse tree.
-     * 
-     *  @param t a tree produced by parsing a grammar using the metagrammar
-     *  @param s the name of the "start symbol"
-     */
-    public static Union create(Tree t, String s) {
-        return create(t, s, new AnnotationGrammarBindingResolver(MetaGrammarBindings.class));
-    }
-
-    /**
      *  Create a grammar from a parse tree and binding resolver
      * 
      *  @param t   a tree produced by parsing a grammar using the metagrammar
@@ -29,14 +19,17 @@ 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);
     }
 
     public static class Bindings {
         public Object repeatTag()                   { return null; }
-        public Sequence tryResolveTag(Production p) { return null; }
+        public Sequence createSequence(Production p) {
+            if (p.tag==null) return null;
+            return Sequence.rewritingSequence(p.tag, p.elements, p.drops);
+        }
     }
     
 }