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

diff --git a/src/edu/berkeley/sbp/misc/RegressionTests.java b/src/edu/berkeley/sbp/misc/RegressionTests.java
index 9c1290b..677f7dd 100644
--- a/src/edu/berkeley/sbp/misc/RegressionTests.java
+++ b/src/edu/berkeley/sbp/misc/RegressionTests.java
@@ -1,3 +1,5 @@
+// Copyright 2006 all rights reserved; see LICENSE file for BSD-style license
+
 package edu.berkeley.sbp.misc;
 import java.io.*;
 import java.util.*;
@@ -15,6 +17,10 @@ public class RegressionTests {
     public static boolean yes = false;
     public static boolean graph = false;
 
+    public static void main() throws Exception {
+      main(new String[] { "tests/meta.g", "tests/testcase.g", "tests/regression.tc" });
+    }
+
     public static void main(String[] s) throws Exception {
         try {
             boolean profile = false;
@@ -33,7 +39,7 @@ public class RegressionTests {
 
             System.err.println("parsing " + s[0]);
             Tree<String> res = new CharParser(MetaGrammar.newInstance()).parse(new FileInputStream(s[0])).expand1();
-            Union meta = Grammar.create(res, "s");
+            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]));
@@ -89,7 +95,7 @@ public class RegressionTests {
         }
     }
 
-    public static class TestCaseMaker extends AnnotationGrammarBindingResolver {
+    public static class TestCaseMaker extends AnnotationGrammarBindings {
         public TestCaseMaker() {
             super(TestCaseMakerHelper.class);
             add(MetaGrammarBindings.class, "grammar");
@@ -97,7 +103,7 @@ public class RegressionTests {
         }
         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());
+                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); }
@@ -154,7 +160,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");
@@ -194,18 +203,18 @@ public class RegressionTests {
     public static class TestCaseBuilder extends StringWalker {
         public Object walk(Tree<String> tree) {
             try {
-                if ("grammaro".equals(tree.head())) return Grammar.create(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 = Grammar.create(tree.child(tree.numChildren()-1), "s");
+                    String[] output = tree.size()>2 ? ((String[])walk(tree, 1)) : new String[0];
+                    Union grammar = Grammar.create(tree.child(tree.size()-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);
                 else if (tree.head() == null) {
-                    Object[] ret = new Object[tree.numChildren()];
+                    Object[] ret = new Object[tree.size()];
                     for(int i=0; i<ret.length; i++)
                         ret[i] = walk(tree.child(i));
                     return Reflection.lub(ret);