cleanups, reorg, and commenting

[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 d15a4d3..18db16d 100644 (file)
--- a/src/edu/berkeley/sbp/meta/MetaGrammar.java
+++ b/src/edu/berkeley/sbp/meta/MetaGrammar.java
@@ -14,7 +14,7 @@ public class MetaGrammar {
 
     /** create a grammar corresponding to the SBP metagrammar (<tt>meta.g</tt>) */
     public static Union newInstance() {
 
     /** create a grammar corresponding to the SBP metagrammar (<tt>meta.g</tt>) */
     public static Union newInstance() {

-        return Grammar.create(MetaGrammar.meta, "s");
+        return GrammarBuilder.buildFromAST(MetaGrammar.meta, "s", new File[0]);

     }
 
     /** Used to rebuild MetaGrammar.java, and not for much else */
     }
 
     /** Used to rebuild MetaGrammar.java, and not for much else */

@@ -39,10 +39,8 @@ public class MetaGrammar {
 
         out.append("\n        // DO NOT EDIT STUFF BELOW: IT IS AUTOMATICALLY GENERATED\n");
 
 
         out.append("\n        // DO NOT EDIT STUFF BELOW: IT IS AUTOMATICALLY GENERATED\n");
 

-        Tree t = MetaGrammar.meta;
-        Union u = Grammar.create(t, "s");
-
-        t = new CharParser((Union)u).parse(new FileInputStream(args[0])).expand1();
+        Union u = GrammarBuilder.buildFromAST(MetaGrammar.meta, "s", new File[0]);
+        Tree t = new CharParser((Union)u).parse(new FileInputStream(args[0])).expand1();

 
         t.toJava(out);
         out.append("\n        // DO NOT EDIT STUFF ABOVE: IT IS AUTOMATICALLY GENERATED\n");
 
         t.toJava(out);
         out.append("\n        // DO NOT EDIT STUFF ABOVE: IT IS AUTOMATICALLY GENERATED\n");