X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2Fmisc%2FCommandLine.java;h=9994a1bb0e428a2af69157e053b6db5539d7287f;hb=HEAD;hp=ca9086dd7dd82cd8256015bda1d3308717f7b477;hpb=9406152ce9e037b07b6b832b1535d17ee6aefa45;p=sbp.git

diff --git a/src/edu/berkeley/sbp/misc/CommandLine.java b/src/edu/berkeley/sbp/misc/CommandLine.java
index ca9086d..9994a1b 100644
--- a/src/edu/berkeley/sbp/misc/CommandLine.java
+++ b/src/edu/berkeley/sbp/misc/CommandLine.java
@@ -1,4 +1,4 @@
-// Copyright 2006 all rights reserved; see LICENSE file for BSD-style license
+// Copyright 2006-2007 all rights reserved; see LICENSE file for BSD-style license
 
 package edu.berkeley.sbp.misc;
 
@@ -9,24 +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");
@@ -38,6 +28,4 @@ public class CommandLine {
             System.exit(-1);
         }
     }
-
-
 }