checkpoint

[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 b31d5c3..beb7110 100644 (file)
--- a/src/edu/berkeley/sbp/misc/RegressionTests.java
+++ b/src/edu/berkeley/sbp/misc/RegressionTests.java
@@ -81,9 +81,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;
@@ -143,7 +148,7 @@ public class RegressionTests {
                     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();
+                    MetaGrammar gram = jav ? new JavaGrammar() : tib ? /*new Tib.Grammar()*/null : new MetaGrammar();
                     Union grammar = (Union)((MetaGrammar)(gram.walk(tree, tree.numChildren()-1))).done("s");
                     return new TestCase(input, output, grammar, tib, jav);
                 } else if ("ts".equals(tree.head())) return walk(tree, 0);