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 {
}
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();
+ //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);
public static class TestCaseMaker extends AnnotationGrammarBindingResolver {
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 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 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");
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");
TestCase tc = new TestCase(input, output, grammar, false, false);
return tc;
} else if ("ts".equals(tree.head())) return walk(tree, 0);