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.*;
-import static edu.berkeley.sbp.misc.Demo.*;
+import static edu.berkeley.sbp.meta.MetaGrammar.*;
public class RegressionTests {
}
System.err.println("parsing " + s[0]);
- Tree<String> res = new CharParser(Demo.make()).parse(new FileInputStream(s[0])).expand1();
- Union meta = Demo.make(res, "s");
+ Tree<String> res = new CharParser(MetaGrammar.make()).parse(new FileInputStream(s[0])).expand1();
+ Union meta = MetaGrammar.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 = Demo.make(res, "ts", new TestCaseMaker());
+ Union testcasegrammar = MetaGrammar.make(res, "ts", new TestCaseMaker());
if (testcasegrammar==null) return;
CharParser parser = new CharParser(testcasegrammar);
}
}
- public static class TestCaseMaker extends ReflectiveMeta {
+ public static class TestCaseMaker extends AnnotationGrammarBindingResolver {
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
+ MetaGrammarBindings.Grammar.class,
+ MetaGrammarBindings.NonTerminal.class,
+ MetaGrammarBindings.AnonUn.class,
+ MetaGrammarBindings.Range.class,
+ MetaGrammarBindings.El.class,
+ MetaGrammarBindings.Seq.class,
+ MetaGrammarBindings.NonTerminalReference.class,
+ MetaGrammarBindings.Literal.class,
+ MetaGrammarBindings.XTree.class,
+ MetaGrammarBindings.CharClass.class
});
}
- public static class TestCaseMakerHelper extends MG {
- public static @tag("grammaro") @raw Object grammaro(Iterable<Tree> t) {
+ public static class TestCaseMakerHelper extends MetaGrammarBindings {
+ public static @bind.as("grammaro") @bind.raw Object grammaro(Iterable<Tree> t) {
System.out.println("working on " + t);
- return Demo.make(t.iterator().next(), "s", new ReflectiveMetaPlain());
+ return MetaGrammar.make(t.iterator().next(), "s", new TaggingGrammarBindingResolver());
}
- //public static @tag("tca") Object tca(Object[] o) throws IOException {
+ //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 @tag("tca") Object tca(String input, String[] output, Union u) throws IOException {
+ 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 @tag("tcb") Object tca(String input, Union u) throws IOException {
+ 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 @tag("ts") TestCase[] go(TestCase[] cases) { return cases; }
- public static @tag("o") Object o(Object[] s) { return s; }
+ 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 TestCaseBuilder extends StringWalker {
public Object walk(Tree<String> tree) {
try {
- 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());
+ if ("grammaro".equals(tree.head())) return MetaGrammar.make(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 = Demo.make(tree.child(tree.numChildren()-1), "s");
+ Union grammar = MetaGrammar.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);
}
}
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;
+ }
}
-