X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2Fmisc%2FHaskellHelper.java;h=d5a3eae328c402a756c023fb0a7af3e903c457fd;hb=8ed318cb9c9f27861adf519522cbe9d95f094dab;hp=d4f43a73cec6b83e9708ab22f6894f93d8303354;hpb=c042bb0dcce5d64f09b2788b2dfb722145162d2b;p=sbp.git

diff --git a/src/edu/berkeley/sbp/misc/HaskellHelper.java b/src/edu/berkeley/sbp/misc/HaskellHelper.java
index d4f43a7..d5a3eae 100644
--- a/src/edu/berkeley/sbp/misc/HaskellHelper.java
+++ b/src/edu/berkeley/sbp/misc/HaskellHelper.java
@@ -6,24 +6,18 @@ import edu.berkeley.sbp.*;
 import edu.berkeley.sbp.misc.*;
 import edu.berkeley.sbp.meta.*;
 import edu.berkeley.sbp.chr.*;
+import edu.berkeley.sbp.tib.*;
 import java.io.*;
 
 public class HaskellHelper {
-
-    public static Tree main(String grammarFile, String targetFile) throws Throwable {
+    public static void main(String[] argv) throws Throwable { help(argv[0], argv[1]); }
+    public static boolean isNull(Object o) { return o==null; }
+    public static Tree help(String grammarFile, String targetFile) throws Throwable {
         try {
             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 ret = new CharParser(meta).parse(new FileInputStream(targetFile)).expand1();
+            Union meta = Grammar.create(res, "s");
+            Input input = new Tib(new FileInputStream(targetFile));
+            Tree ret = new CharParser(meta).parse(input).expand1();
             if (ret==null) throw new NullPointerException("CharParser returned null");
             return ret;
         } catch (Throwable e) {
@@ -31,6 +25,4 @@ public class HaskellHelper {
             throw e;
         }
     }
-
-
 }