tentative checkpoint ROLL THIS BACK BUT INCLUDES CRUCIAL FIX

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

diff --git a/src/edu/berkeley/sbp/misc/RegressionTests.java b/src/edu/berkeley/sbp/misc/RegressionTests.java
index 353866d..533cb89 100644 (file)
--- a/src/edu/berkeley/sbp/misc/RegressionTests.java
+++ b/src/edu/berkeley/sbp/misc/RegressionTests.java
@@ -11,10 +11,17 @@ import edu.berkeley.sbp.util.*;
 public class RegressionTests {
 
     public static boolean yes = false;
+    public static boolean graph = false;
 
     public static void main(String[] s) throws Exception {
         try {
             boolean profile = false;
+            if (s[0].equals("-graph")) {
+                graph = true;
+                String[] s2 = new String[s.length-1];
+                System.arraycopy(s, 1, s2, 0, s2.length);
+                s = s2;
+            }
             if (s[0].equals("-profile")) {
                 profile = true;
                 String[] s2 = new String[s.length-1];
@@ -28,7 +35,7 @@ public class RegressionTests {
             System.err.println("parsing " + s[0]);
             Tree<String> res = new CharParser(MetaGrammar.make()).parse(new FileInputStream(s[0])).expand1();
             //System.out.println(mg);
-            Union meta = MetaGrammar.make();
+            Union meta = MetaGrammar.make(res, "s");
             System.err.println("parsing " + s[1]);
             SequenceInputStream sis = new SequenceInputStream(new FileInputStream(s[0]), new FileInputStream(s[1]));
             res = new CharParser(meta).parse(sis).expand1();
@@ -52,11 +59,6 @@ public class RegressionTests {
                 System.exit(0);
             }
             System.err.println("expanding...");
-            GraphViz gv = new GraphViz();
-            r2.toGraphViz(gv);
-            FileOutputStream fox = new FileOutputStream("out.dot");
-            gv.dump(fox);
-            fox.close();
 
             TestCase[] expanded = (TestCase[])new TestCaseBuilder().walk(r2.expand1());
             System.err.println("executing...");
@@ -91,27 +93,28 @@ public class RegressionTests {
             return ret;
         }
         public boolean execute() throws Exception {
-            if (jav) {
-                Forest<String> tree = new CharParser(grammar).parse(new StringReader(input));
-                FileOutputStream fos = new FileOutputStream("/Users/megacz/Desktop/out.dot");
-                PrintWriter p = new PrintWriter(new OutputStreamWriter(fos));
-                GraphViz gv = new GraphViz();
-                tree.toGraphViz(gv);
-                gv.dump(p);
-                p.flush();
-                p.close();
-                return true;
-            }
             Forest<String> res = null;
             ParseFailed pfe = null;
+            CharParser parser = new CharParser(grammar);
+            parser.helpgc = false;
             try {
                 res = tib 
                     ? /*new CharParser(grammar).parse(new Tib(input))*/ null
-                : new CharParser(grammar).parse(new StringReader(input));
+                : parser.parse(new StringReader(input));
             } catch (ParseFailed pf) {
                 pfe = pf;
             }
             //ystem.out.println("res=="+res);
+            if (graph) {
+                FileOutputStream fos = new FileOutputStream("out.dot");
+                PrintWriter p = new PrintWriter(new OutputStreamWriter(fos));
+                GraphViz gv = new GraphViz();
+                res.toGraphViz(gv);
+                gv.dump(p);
+                p.flush();
+                p.close();
+                System.out.println(parser);
+            }
             Collection<Tree<String>> results = res==null ? new HashSet<Tree<String>>() : res.expand(false);
             System.out.print("\r");
             if (results == null || (results.size() == 0 && (output!=null && output.length > 0))) {