X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2Fmisc%2FRegressionTests.java;h=02a5eee74210c041e81962b0ba8852dcd1d89a41;hb=117f3082281baf893dd183c0d50d809b147f2f1c;hp=b186b43f3ae7d3c3df1a80dda61d536ab1b204a2;hpb=ac0f7d32be59d02b1f8d48d2b23232adf8871b46;p=sbp.git

diff --git a/src/edu/berkeley/sbp/misc/RegressionTests.java b/src/edu/berkeley/sbp/misc/RegressionTests.java
index b186b43..02a5eee 100644
--- a/src/edu/berkeley/sbp/misc/RegressionTests.java
+++ b/src/edu/berkeley/sbp/misc/RegressionTests.java
@@ -59,7 +59,7 @@ public class RegressionTests {
             System.err.println("expanding...");
 
             Tree t = r2.expand1();
-            TestCase[] expanded = (TestCase[])((Demo.Reducer)t.head()).reduce(t);
+            TestCase[] expanded = (TestCase[])((Functor)t.head()).invoke(t.children());
             System.err.println("executing...");
             for(TestCase tc : expanded) {
                 tc.execute();
@@ -103,9 +103,9 @@ public class RegressionTests {
             });
         }
         public static class TestCaseMakerHelper extends MG {
-            public static @tag("grammaro") @raw Object grammaro(Tree t) {
+            public static @tag("grammaro") @raw Object grammaro(Iterable<Tree> t) {
                 System.out.println("working on " + t);
-                return Demo.make(t.child(0), "s", new ReflectiveMetaPlain());
+                return Demo.make(t.iterator().next(), "s", new ReflectiveMetaPlain());
             }
             //public static @tag("tca")           Object tca(Object[] o) throws IOException {
             //return new TestCase((String)o[0], (String[])o[1], (Union)o[2], false, false); }