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

diff --git a/src/edu/berkeley/sbp/misc/RegressionTests.java b/src/edu/berkeley/sbp/misc/RegressionTests.java
index 7a8e502..9c1290b 100644
--- a/src/edu/berkeley/sbp/misc/RegressionTests.java
+++ b/src/edu/berkeley/sbp/misc/RegressionTests.java
@@ -4,6 +4,8 @@ import java.util.*;
 import java.lang.reflect.*;
 import edu.berkeley.sbp.*;
 import edu.berkeley.sbp.misc.*;
+import edu.berkeley.sbp.meta.*;
+import edu.berkeley.sbp.bind.*;
 import edu.berkeley.sbp.tib.*;
 import edu.berkeley.sbp.chr.*;
 import edu.berkeley.sbp.util.*;
@@ -30,12 +32,14 @@ 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(MetaGrammar.newInstance()).parse(new FileInputStream(s[0])).expand1();
+            Union meta = Grammar.create(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");
+            //SequenceInputStream sis = new SequenceInputStream(new FileInputStream(s[0]), new FileInputStream(s[1]));
+            res = new CharParser(meta).parse(new FileInputStream(s[1])).expand1();
+
+            Union testcasegrammar = Grammar.create(res, "ts", new TestCaseMaker());
             if (testcasegrammar==null) return;
             CharParser parser = new CharParser(testcasegrammar);
 
@@ -56,7 +60,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);
             System.err.println("executing...");
             for(TestCase tc : expanded) {
                 tc.execute();
@@ -84,17 +89,39 @@ public class RegressionTests {
         }
     }
 
+    public static class TestCaseMaker extends AnnotationGrammarBindingResolver {
+        public TestCaseMaker() {
+            super(TestCaseMakerHelper.class);
+            add(MetaGrammarBindings.class, "grammar");
+            //add(MetaGrammarBindings.class, "");
+        }
+        public static class TestCaseMakerHelper {
+            public static @bind.as("grammaro") @bind.raw Object grammaro(Iterable<Tree> t) {
+                return Grammar.create(t.iterator().next(), "s", new TaggingGrammarBindingResolver());
+            }
+            //public static @bind.as("tca")           Object tca(Object[] o) throws IOException {
+            //return new TestCase((String)o[0], (String[])o[1], (Union)o[2], false, false); }
+            public static @bind.as("tca")           Object tca(String input, String[] output, Union u) throws IOException {
+                return new TestCase(input, output, u, false, false); }
+            public static @bind.as("tcb")           Object tca(String input, Union u) throws IOException {
+                return new TestCase(input, new String[0], u, false, false); }
+            public static @bind.as("ts") TestCase[] go(TestCase[] cases) { return cases; }
+            public static @bind.as("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 +194,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");
-                else if ("output".equals(tree.head())) return MetaGrammar.string(tree.children());
-                else if ("input".equals(tree.head())) return MetaGrammar.string(tree.children());
+                if ("grammaro".equals(tree.head())) return Grammar.create(tree, "s");
+                else if ("output".equals(tree.head())) return string(tree.children());
+                else if ("input".equals(tree.head())) return string(tree.children());
                 else if ("testcase".equals(tree.head())) {
-                    String input = MetaGrammar.string(tree.child(0));
+                    String input = 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 = Grammar.create(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);
@@ -190,5 +217,15 @@ public class RegressionTests {
         }
     }
     private static String pad(int i,String s) { return s.length() >= i ? s : pad(i-1,s)+" "; }
+    public static String string(Tree<String> tree) {
+        String ret = "";
+        if (tree.head()!=null) ret += tree.head();
+        ret += string(tree.children());
+        return ret;
+    }
+    public static String string(Iterable<Tree<String>> children) {
+        String ret = "";
+        for(Tree<String> t : children) ret += string(t);
+        return ret;
+    }
 }
-