checkpoint

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

diff --git a/src/edu/berkeley/sbp/meta/MetaGrammar.java b/src/edu/berkeley/sbp/meta/MetaGrammar.java
index 5a055c9..45ab195 100644 (file)
--- a/src/edu/berkeley/sbp/meta/MetaGrammar.java
+++ b/src/edu/berkeley/sbp/meta/MetaGrammar.java
@@ -13,9 +13,7 @@ public class MetaGrammar {
 
     /** create a grammar corresponding to the SBP metagrammar (<tt>meta.g</tt>) */
     public static Union newInstance() {
-        return Grammar.create(MetaGrammar.meta,
-                            "s",
-                            new AnnotationGrammarBindingResolver(MetaGrammarBindings.class));
+        return Grammar.create(MetaGrammar.meta, "s", new MetaGrammarBindings());
     }
 
     /** Used to rebuild MetaGrammar.java, and not for much else */
@@ -41,7 +39,7 @@ public class MetaGrammar {
         out.append("\n        // DO NOT EDIT STUFF BELOW: IT IS AUTOMATICALLY GENERATED\n");
 
         Tree t = MetaGrammar.meta;
-        Union u = Grammar.create(t, "s");
+        Union u = Grammar.create(t, "s", new MetaGrammarBindings());
 
         t = new CharParser((Union)u).parse(new FileInputStream(args[0])).expand1();