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 8af63a2..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];
@@ -25,9 +32,11 @@ public class RegressionTests {
             //MetaGrammar mg0 = new MetaGrammar();
             //mg0.walk(MetaGrammar.meta);
             //System.out.println(mg0);
+            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();
             Union testcasegrammar = MetaGrammar.make(res, "ts");
@@ -40,6 +49,7 @@ public class RegressionTests {
             }
             System.gc();
             long now = System.currentTimeMillis();
+            System.err.println("parsing " + s[2]);
             Forest<String> r2 = parser.parse(new FileInputStream(s[2]));
             System.out.println();
             System.out.println("elapsed = " + (System.currentTimeMillis()-now) + "ms");
@@ -48,7 +58,11 @@ public class RegressionTests {
                 System.in.read();
                 System.exit(0);
             }
-            for(TestCase tc : (TestCase[])new TestCaseBuilder().walk(r2.expand1())) tc.execute();
+            System.err.println("expanding...");
+
+            TestCase[] expanded = (TestCase[])new TestCaseBuilder().walk(r2.expand1());
+            System.err.println("executing...");
+            for(TestCase tc : expanded) tc.execute();
 
         } catch (Throwable t) {
             System.err.println("\n\nexception thrown, class == " + t.getClass().getName());
@@ -79,30 +93,31 @@ 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.size() == 0 && output.length > 0) {
+            if (results == null || (results.size() == 0 && (output!=null && output.length > 0))) {
                 System.out.print("\033[31m");
                 System.out.println("PARSE FAILED");
                 System.out.print("\033[0m");
@@ -142,15 +157,20 @@ public class RegressionTests {
                 if ("grammar".equals(tree.head())) return MetaGrammar.make(tree, "s");
                 else if ("output".equals(tree.head())) return MetaGrammar.string(tree.children());
                 else if ("input".equals(tree.head())) return MetaGrammar.string(tree.children());
-                else if ("javacase".equals(tree.head()) || "tibcase".equals(tree.head()) || "testcase".equals(tree.head())) {
+                else if ("testcase".equals(tree.head())) {
                     String input = MetaGrammar.string(tree.child(0));
                     String[] output = tree.numChildren()>2 ? ((String[])walk(tree, 1)) : new String[0];
-                    boolean tib = "tibcase".equals(tree.head());
-                    boolean jav = "javacase".equals(tree.head());
                     Union grammar = MetaGrammar.make(tree.child(tree.numChildren()-1), "s");
-                    return new TestCase(input, output, grammar, tib, jav);
+                    TestCase tc = new TestCase(input, output, grammar, false, false);
+                    return tc;
                 } else if ("ts".equals(tree.head())) return walk(tree, 0);
-                else return super.walk(tree);
+                else if (tree.head() == null) {
+                    Object[] ret = new Object[tree.numChildren()];
+                    for(int i=0; i<ret.length; i++)
+                        ret[i] = walk(tree.child(i));
+                    return Reflection.lub(ret);
+                }
+                return super.walk(tree);
             } catch (Exception e) {
                 throw new Error(e);
             }