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

diff --git a/src/edu/berkeley/sbp/misc/RegressionTests.java b/src/edu/berkeley/sbp/misc/RegressionTests.java
index 7a8e502..02a5eee 100644
--- a/src/edu/berkeley/sbp/misc/RegressionTests.java
+++ b/src/edu/berkeley/sbp/misc/RegressionTests.java
@@ -7,6 +7,7 @@ import edu.berkeley.sbp.misc.*;
 import edu.berkeley.sbp.tib.*;
 import edu.berkeley.sbp.chr.*;
 import edu.berkeley.sbp.util.*;
+import static edu.berkeley.sbp.misc.Demo.*;
 
 public class RegressionTests {
 
@@ -30,12 +31,13 @@ public class RegressionTests {
             }
 
             System.err.println("parsing " + s[0]);
-            Tree<String> res = new CharParser(MetaGrammar.make()).parse(new FileInputStream(s[0])).expand1();
-            Union meta = MetaGrammar.make(res, "s");
+            Tree<String> res = new CharParser(Demo.make()).parse(new FileInputStream(s[0])).expand1();
+            Union meta = Demo.make(res, "s");
             System.err.println("parsing " + s[1]);
             SequenceInputStream sis = new SequenceInputStream(new FileInputStream(s[0]), new FileInputStream(s[1]));
             res = new CharParser(meta).parse(sis).expand1();
-            Union testcasegrammar = MetaGrammar.make(res, "ts");
+
+            Union testcasegrammar = Demo.make(res, "ts", new TestCaseMaker());
             if (testcasegrammar==null) return;
             CharParser parser = new CharParser(testcasegrammar);
 
@@ -56,7 +58,8 @@ public class RegressionTests {
             }
             System.err.println("expanding...");
 
-            TestCase[] expanded = (TestCase[])new TestCaseBuilder().walk(r2.expand1());
+            Tree t = r2.expand1();
+            TestCase[] expanded = (TestCase[])((Functor)t.head()).invoke(t.children());
             System.err.println("executing...");
             for(TestCase tc : expanded) {
                 tc.execute();
@@ -84,17 +87,49 @@ public class RegressionTests {
         }
     }
 
+    public static class TestCaseMaker extends ReflectiveMeta {
+        public TestCaseMaker() {
+            super(TestCaseMakerHelper.class, new Class[] {
+                     MG.Grammar.class,
+                     MG.NonTerminal.class,
+                     MG.AnonUn.class,
+                     MG.Range.class,
+                     MG.El.class,
+                     MG.Seq.class,
+                     MG.NonTerminalReference.class,
+                     MG.StringLiteral.class,
+                     MG.XTree.class,
+                     MG.CharClass.class
+            });
+        }
+        public static class TestCaseMakerHelper extends MG {
+            public static @tag("grammaro") @raw Object grammaro(Iterable<Tree> t) {
+                System.out.println("working on " + t);
+                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); }
+            public static @tag("tca")           Object tca(String input, String[] output, Union u) throws IOException {
+                return new TestCase(input, output, u, false, false); }
+            public static @tag("tcb")           Object tca(String input, Union u) throws IOException {
+                return new TestCase(input, new String[0], u, false, false); }
+            public static @tag("ts") TestCase[] go(TestCase[] cases) { return cases; }
+            public static @tag("o") Object o(Object[] s) { return s; }
+        }
+    }
+
     public static class TestCase {
         private final boolean tib;
         private final boolean jav;
         public /*final*/ String input;        
         public final String[] output;
         public final Union grammar;
+
         public TestCase(String input, String[] output, Union grammar, boolean tib, boolean jav) throws IOException {
             this.tib = tib;
             this.jav = jav;
             this.input = input;
-            this.output = output;
+            this.output = output==null ? new String[0] : output;
             this.grammar = grammar;
         }
         public String toString() {
@@ -167,13 +202,13 @@ public class RegressionTests {
     public static class TestCaseBuilder extends StringWalker {
         public Object walk(Tree<String> tree) {
             try {
-                if ("grammar".equals(tree.head())) return MetaGrammar.make(tree, "s");
+                if ("grammaro".equals(tree.head())) return Demo.make(tree, "s");
                 else if ("output".equals(tree.head())) return MetaGrammar.string(tree.children());
                 else if ("input".equals(tree.head())) return MetaGrammar.string(tree.children());
                 else if ("testcase".equals(tree.head())) {
                     String input = MetaGrammar.string(tree.child(0));
                     String[] output = tree.numChildren()>2 ? ((String[])walk(tree, 1)) : new String[0];
-                    Union grammar = MetaGrammar.make(tree.child(tree.numChildren()-1), "s");
+                    Union grammar = Demo.make(tree.child(tree.numChildren()-1), "s");
                     TestCase tc = new TestCase(input, output, grammar, false, false);
                     return tc;
                 } else if ("ts".equals(tree.head())) return walk(tree, 0);