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 8d165ff..7acb66a 100644 (file)
--- a/src/edu/berkeley/sbp/misc/RegressionTests.java
+++ b/src/edu/berkeley/sbp/misc/RegressionTests.java
@@ -129,16 +129,23 @@ public class RegressionTests {
             return new TestCase(input, output,        grammar, false); }
         public TestCase testcase(String input,                  Union grammar) throws IOException {
             return new TestCase(input, new String[0], grammar, false); }
+        public TestCase tibcase(String input, String[] output, Union grammar) throws IOException {
+            return new TestCase(input, output,        grammar, true); }
         public TestCase  tibcase(String input,                  Union grammar) throws IOException {
             return new TestCase(input, new String[0], grammar, true); }
         public MetaGrammar grammar(Object[] o) { return this; }
-        public Object walk(String tag, Object[] args) {
-            if ("grammar".equals(tag)) {
-                System.out.println("\n" + this + "\n");
-                return done("s");
-            }
-            else return super.walk(tag, args);
+        
+        public Object walk(Tree<String> tree) {
+            if ("grammar".equals(tree.head())) { for(Tree<String> t : tree.children()) walk(t); return done("s"); }
+            //if ("grammar".equals(tree.head())) return done("s");
+            else return super.walk(tree);
+        }
+        /*        
+        public Object walk(String head, Object[] args) {
+            if ("grammar".equals(head)) return done("s");
+            else return super.walk(head, args);
         }
+        */
     }
 
     private static String pad(int i,String s) { return s.length() >= i ? s : pad(i-1,s)+" "; }