X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2Fmeta%2FGrammar.java;h=fc96aca699ddc066745c9546147460e8902988c9;hp=857c1762fb3bcf3900cceb730bddbb577e45c26b;hb=7dd51387ce4308d3784a1291604203aaf677ba16;hpb=9d727bd14c659cdc6c34153b988e8d3fdb8067f5

diff --git a/src/edu/berkeley/sbp/meta/Grammar.java b/src/edu/berkeley/sbp/meta/Grammar.java
index 857c176..fc96aca 100644
--- a/src/edu/berkeley/sbp/meta/Grammar.java
+++ b/src/edu/berkeley/sbp/meta/Grammar.java
@@ -5,7 +5,6 @@ import edu.berkeley.sbp.util.*;
 import edu.berkeley.sbp.*;
 import edu.berkeley.sbp.chr.*;
 import edu.berkeley.sbp.misc.*;
-import edu.berkeley.sbp.bind.*;
 import java.util.*;
 import java.lang.annotation.*;
 import java.lang.reflect.*;
@@ -20,18 +19,8 @@ public class Grammar {
      *  @param s   the name of the "start symbol"
      *  @param gbr a GrammarBindingResolver that resolves grammatical reductions into tree-node-heads
      */
-    public static Union create(Tree t, String s, Grammar.Bindings gbr) {
-        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 createSequence(Production p) {
-            if (p.tag==null) return null;
-            return Sequence.create(p.tag, p.elements, p.drops, false);
-        }
+    public static Union create(Tree t, String s) {
+        return new GrammarBuilder("tests/" /*FIXME*/, "").buildGrammar(t, s);
     }
     
 }