X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2Fmisc%2FRegressionTests.java;h=a88c8a4c0113beba388d7117032e88b8e171eb8a;hp=943c6118c03d883d112afd2eba7d6d543b5e5225;hb=6bee7f519f499a92a92a459fd2c903d85de0759c;hpb=e2a835683bc6f2f873b17710ba85806720f88127

diff --git a/src/edu/berkeley/sbp/misc/RegressionTests.java b/src/edu/berkeley/sbp/misc/RegressionTests.java
index 943c611..a88c8a4 100644
--- a/src/edu/berkeley/sbp/misc/RegressionTests.java
+++ b/src/edu/berkeley/sbp/misc/RegressionTests.java
@@ -8,20 +8,6 @@ import edu.berkeley.sbp.tib.*;
 public class RegressionTests {
 
     public static boolean yes = false;
-    public static class MyWalker extends ReflectiveWalker {
-        public String top(Object[] o) { return "top("+join(o)+")"; }
-        public String str(String[] s) { String ret = ""; for(String st : s) ret += st; return ret; }
-        public String join(Object[] o) { String ret = ""; for(Object st : o) ret += st; return ret; }
-        public String whilex(Object s, Object y) { return "while("+s+") " + y; }
-        public String seq(Object[] statements) {
-            String ret = "";
-            for(Object s : statements) ret += s + ";\n";
-            return ret;
-        }
-        /*
-        public String bl(String s) { return "{" + s + "}"; }
-        */
-    };
 
     public static void main(String[] s) throws Exception {
         try {
@@ -131,8 +117,10 @@ public class RegressionTests {
                 else if ("tibcase".equals(tree.head()) || "testcase".equals(tree.head())) {
                     String input = string(tree.child(0));
                     String[] output = tree.numChildren()>2 ? ((String[])walk(tree, 1)) : new String[0];
-                    Union grammar = (Union)walk(tree, tree.numChildren()-1);
-                    return new TestCase(input, output, grammar, "tibcase".equals(tree.head()));
+                    boolean tib = "tibcase".equals(tree.head());
+                    MetaGrammar gram = 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);
                 } else if ("ts".equals(tree.head())) return walk(tree, 0);
                 else return super.walk(tree);
             } catch (Exception e) {