fix build issues with CommandLine.java

[sbp.git] / src / edu / berkeley / sbp / misc / CommandLine.java

diff --git a/src/edu/berkeley/sbp/misc/CommandLine.java b/src/edu/berkeley/sbp/misc/CommandLine.java
index b462e6f..9994a1b 100644 (file)
--- a/src/edu/berkeley/sbp/misc/CommandLine.java
+++ b/src/edu/berkeley/sbp/misc/CommandLine.java
@@ -9,22 +9,14 @@ import edu.berkeley.sbp.chr.*;
 import java.io.*;
 
 public class CommandLine {
-    /*
     public static void main(String[] argv) throws Throwable {
         String grammarFile = argv[0];
         String targetFile = argv[1];
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         try {
             System.setErr(new PrintStream(baos));
-            Tree<String> res = new CharParser(MetaGrammar.newInstance()).parse(new FileInputStream(grammarFile)).expand1();
-            Union meta = Grammar.create(res, "s",
-                                        new Grammar.Bindings() {
-                                            //public Sequence createSequence(Production p) {
-                                            //Sequence ret = super.createSequence(p);
-                                            //if (ret != null) return ret;
-                                            //return Sequence.create(p.nonTerminal, p.elements, p.drops, false);
-                                            //}
-                                        });
+            Tree<String> res = new CharParser(MetaGrammar.getMetaGrammar()).parse(new FileInputStream(grammarFile)).expand1();
+            Union meta = GrammarAST.buildFromAST(res, "s", null);
             CharInput input = new CharInput(new FileInputStream(targetFile), "", true);
             Tree ret = new CharParser(meta).parse(input).expand1();
             if (ret==null) throw new NullPointerException("CharParser returned null");
@@ -36,5 +28,4 @@ public class CommandLine {
             System.exit(-1);
         }
     }
-    */
 }