X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2Fmisc%2FRegressionTests.java;h=0848ce8722731630ea337c76f8bb1abad7c32783;hp=aa12c2a14df622a181f33b3d3699269da7aea5c1;hb=eb259587aa27f3be21ea34370bca59a0f7925cb6;hpb=bea819e3a90c7cc18159e43250b3af87602295f8

diff --git a/src/edu/berkeley/sbp/misc/RegressionTests.java b/src/edu/berkeley/sbp/misc/RegressionTests.java
index aa12c2a..0848ce8 100644
--- a/src/edu/berkeley/sbp/misc/RegressionTests.java
+++ b/src/edu/berkeley/sbp/misc/RegressionTests.java
@@ -66,7 +66,24 @@ public class RegressionTests {
             }
             System.err.println("expanding...");
 
-            TestCase[] expanded = (TestCase[])new GrammarAST(includes, "").walkChildren(r2.expand1());
+            ArrayList<TestCase> cases = new ArrayList<TestCase>();
+            Tree tt = r2.expand1();
+            for(int i=0; i<tt.size(); i++) {
+                Tree t = tt.child(i);
+                String[] expect = new String[t.child(2).size()];
+                for(int j=0; j<t.child(2).size(); j++)
+                    expect[j] = stringifyChildren(t.child(2).child(j));
+                cases.add(new TestCase(stringifyChildren(t.child(0)),
+                                       stringifyChildren(t.child(1)),
+                                       expect,
+                                       GrammarAST.buildFromAST(t.child(3), "s", includes),
+                                       false,
+                                       false));
+                
+            }
+            TestCase[] expanded = new TestCase[cases.size()];
+            for(int i=0; i<expanded.length; i++)
+                expanded[i] = cases.get(i);
             for(TestCase tc : expanded)
                 tc.execute();
 
@@ -79,8 +96,16 @@ public class RegressionTests {
         }
     }
 
+    private static String stringifyChildren(Tree t) {
+        StringBuffer sb = new StringBuffer();
+        for(int i=0; i<t.size(); i++) {
+            sb.append(t.child(i).head());
+            sb.append(stringifyChildren(t.child(i)));
+        }
+        return sb.toString();
+    }
+
     public static class TestCase {
-        private final boolean tib;
         private final boolean jav;
         public /*final*/ String input;        
         public final String[] output;
@@ -89,7 +114,6 @@ public class RegressionTests {
 
         public TestCase(String name, String input, String[] output,
                         Union grammar, boolean tib, boolean jav) {
-            this.tib = tib;
             this.name = name;
             this.jav = jav;
             this.input = input;
@@ -107,15 +131,9 @@ public class RegressionTests {
             ParseFailed pfe = null;
             CharParser parser = new CharParser(grammar);
             System.out.print("     "+name+"\r");
-            //parser.helpgc = false;
             try {
-                res = tib 
-                    ? /*new CharParser(grammar).parse(new Tib(input))*/ null
-                : parser.parse(new StringReader(input));
-            } catch (ParseFailed pf) {
-                pfe = pf;
-            }
-            //ystem.out.println("res=="+res);
+                res = parser.parse(new StringReader(input));
+            } catch (ParseFailed pf) { pfe = pf; }
 
             if (graph) {
                 FileOutputStream fos = new FileOutputStream("out.dot");