X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2Fmisc%2FRegressionTests.java;h=d2443ad37ac6db79c51b8ba684dbcd276ce49d7e;hp=c91a36929178126eea965193cde8dce55637d5b5;hb=4b5b35b9dbcf29da663c72d12aaf6ac3d2083d27;hpb=41b74cd8469abb0bdff811f26594a7ef87cb26a6

diff --git a/src/edu/berkeley/sbp/misc/RegressionTests.java b/src/edu/berkeley/sbp/misc/RegressionTests.java
index c91a369..d2443ad 100644
--- a/src/edu/berkeley/sbp/misc/RegressionTests.java
+++ b/src/edu/berkeley/sbp/misc/RegressionTests.java
@@ -9,7 +9,6 @@ import edu.berkeley.sbp.bind.*;
 import edu.berkeley.sbp.tib.*;
 import edu.berkeley.sbp.chr.*;
 import edu.berkeley.sbp.util.*;
-import static edu.berkeley.sbp.meta.MetaGrammar.*;
 
 public class RegressionTests {
 
@@ -33,14 +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", new MetaGrammarBindings());
 
             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();
+            //SequenceInputStream sis = new SequenceInputStream(new FileInputStream(s[0]), new FileInputStream(s[1]));
+            res = new CharParser(meta).parse(new FileInputStream(s[1])).expand1();
 
-            Union testcasegrammar = MetaGrammar.make(res, "ts", new TestCaseMaker());
+            Union testcasegrammar = Grammar.create(res, "ts", new TestCaseMaker());
             if (testcasegrammar==null) return;
             CharParser parser = new CharParser(testcasegrammar);
 
@@ -62,7 +61,7 @@ public class RegressionTests {
             System.err.println("expanding...");
 
             Tree t = r2.expand1();
-            TestCase[] expanded = (TestCase[])((Functor)t.head()).invoke(t.children());
+            TestCase[] expanded = (TestCase[])((Functor)t.head()).invoke(t);
             System.err.println("executing...");
             for(TestCase tc : expanded) {
                 tc.execute();
@@ -90,13 +89,15 @@ public class RegressionTests {
         }
     }
 
-    public static class TestCaseMaker extends AnnotationGrammarBindingResolver {
+    public static class TestCaseMaker extends AnnotationGrammarBindings {
         public TestCaseMaker() {
             super(TestCaseMakerHelper.class);
+            add(MetaGrammarBindings.class, "grammar");
+            //add(MetaGrammarBindings.class, "");
         }
-        public static class TestCaseMakerHelper extends MetaGrammarBindings {
+        public static class TestCaseMakerHelper {
             public static @bind.as("grammaro") @bind.raw Object grammaro(Iterable<Tree> t) {
-                return MetaGrammar.make(t.iterator().next(), "s", new TaggingGrammarBindingResolver());
+                return Grammar.create(t.iterator().next(), "s", new Grammar.Bindings());
             }
             //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); }
@@ -153,7 +154,10 @@ public class RegressionTests {
                 p.close();
                 System.out.println(parser);
             }
-            Collection<Tree<String>> results = res==null ? new HashSet<Tree<String>>() : res.expand(false);
+
+            HashSet<Tree<String>> results = new HashSet<Tree<String>>();
+            if (res != null) res.expand(results);
+
             System.out.print("\r");
             if (results == null || (results.size() == 0 && (output!=null && output.length > 0))) {
                 System.out.print("\033[31m");
@@ -193,13 +197,13 @@ public class RegressionTests {
     public static class TestCaseBuilder extends StringWalker {
         public Object walk(Tree<String> tree) {
             try {
-                if ("grammaro".equals(tree.head())) return MetaGrammar.make(tree, "s");
+                if ("grammaro".equals(tree.head())) return Grammar.create(tree, "s", new MetaGrammarBindings());
                 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 = 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", new MetaGrammarBindings());
                     TestCase tc = new TestCase(input, output, grammar, false, false);
                     return tc;
                 } else if ("ts".equals(tree.head())) return walk(tree, 0);