X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2Fmisc%2FRegressionTests.java;h=353866d3d6ae8c0f51b9064bc438a00afe305353;hb=7d1d5b9e2969e687cc07592f5a212681f8d26479;hp=b31d5c31bba0f6fe13a001dec864c5de126c9dad;hpb=95c87aa402977de2b96c48bd14c439b46ad49777;p=sbp.git

diff --git a/src/edu/berkeley/sbp/misc/RegressionTests.java b/src/edu/berkeley/sbp/misc/RegressionTests.java
index b31d5c3..353866d 100644
--- a/src/edu/berkeley/sbp/misc/RegressionTests.java
+++ b/src/edu/berkeley/sbp/misc/RegressionTests.java
@@ -25,13 +25,14 @@ 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();
-            MetaGrammar mg = (MetaGrammar)new MetaGrammar().walk(res);
             //System.out.println(mg);
-            Union meta = mg.done();
+            Union meta = MetaGrammar.make();
+            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)new MetaGrammar("ts").walk(res)).done("ts");
+            Union testcasegrammar = MetaGrammar.make(res, "ts");
             if (testcasegrammar==null) return;
             CharParser parser = new CharParser(testcasegrammar);
 
@@ -41,6 +42,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");
@@ -49,7 +51,16 @@ public class RegressionTests {
                 System.in.read();
                 System.exit(0);
             }
-            for(TestCase tc : (TestCase[])new TestCaseBuilder().walk(r2.expand1())) tc.execute();
+            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...");
+            for(TestCase tc : expanded) tc.execute();
 
         } catch (Throwable t) {
             System.err.println("\n\nexception thrown, class == " + t.getClass().getName());
@@ -81,9 +92,14 @@ public class RegressionTests {
         }
         public boolean execute() throws Exception {
             if (jav) {
-                Tree<Object> tree = new CharParser(grammar).parse(new StringReader(input)).expand1();
-                System.out.println(tree);
-                System.out.println(JavaGrammar.build(tree));
+                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;
@@ -98,7 +114,7 @@ public class RegressionTests {
             //ystem.out.println("res=="+res);
             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");
@@ -132,28 +148,32 @@ public class RegressionTests {
         }
     }
 
-    public static class TestCaseBuilder extends MetaGrammar {
+    public static class TestCaseBuilder extends StringWalker {
         public Object walk(Tree<String> tree) {
             try {
-                if ("grammar".equals(tree.head())) { walkChildren(tree); return done("s"); }
-                else if ("output".equals(tree.head())) return string(tree.children());
-                else if ("input".equals(tree.head())) return string(tree.children());
-                else if ("javacase".equals(tree.head()) || "tibcase".equals(tree.head()) || "testcase".equals(tree.head())) {
-                    String input = string(tree.child(0));
+                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 ("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());
-                    MetaGrammar gram = jav ? new JavaGrammar() : tib ? new Tib.Grammar() : new MetaGrammar();
-                    Union grammar = (Union)((MetaGrammar)(gram.walk(tree, tree.numChildren()-1))).done("s");
-                    return new TestCase(input, output, grammar, tib, jav);
+                    Union grammar = MetaGrammar.make(tree.child(tree.numChildren()-1), "s");
+                    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);
             }
         }
     }
-
+    /*
     public static class JavaGrammar extends MetaGrammar {
         public Object convertLabel(String label) { return new ClassMark(label); }
         public Object convertFieldLabel(String label) { return new FieldMark(label); }
@@ -242,7 +262,7 @@ public class RegressionTests {
         }
 
     }
-
+    */
     private static String pad(int i,String s) { return s.length() >= i ? s : pad(i-1,s)+" "; }
 }