X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2Fmisc%2FRegressionTests.java;h=1646a173fa3a29014c492472bd36172ad1b796b3;hp=6501727b4c11b69f6a74031cc53d9ab45a847013;hb=bd03a63787dd15ecb9840aa0ee0315d54d738564;hpb=acfe58223b9a0f78e64a14a1ca5d5998626ee3fe diff --git a/src/edu/berkeley/sbp/misc/RegressionTests.java b/src/edu/berkeley/sbp/misc/RegressionTests.java index 6501727..1646a17 100644 --- a/src/edu/berkeley/sbp/misc/RegressionTests.java +++ b/src/edu/berkeley/sbp/misc/RegressionTests.java @@ -4,9 +4,12 @@ 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.*; +import static edu.berkeley.sbp.meta.MetaGrammar.*; public class RegressionTests { @@ -29,17 +32,15 @@ public class RegressionTests { s = s2; } - //MetaGrammar mg0 = new MetaGrammar(); - //mg0.walk(MetaGrammar.meta); - //System.out.println(mg0); System.err.println("parsing " + s[0]); Tree res = new CharParser(MetaGrammar.make()).parse(new FileInputStream(s[0])).expand1(); - //System.out.println(mg); 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 = MetaGrammar.make(res, "ts"); + + Union testcasegrammar = MetaGrammar.make(res, "ts", new TestCaseMaker()); if (testcasegrammar==null) return; CharParser parser = new CharParser(testcasegrammar); @@ -60,7 +61,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.children()); System.err.println("executing..."); for(TestCase tc : expanded) { tc.execute(); @@ -88,17 +90,38 @@ public class RegressionTests { } } + public static class TestCaseMaker extends AnnotationGrammarBindingResolver { + public TestCaseMaker() { + super(TestCaseMakerHelper.class); + } + public static class TestCaseMakerHelper extends MetaGrammarBindings { + public static @bind.as("grammaro") @bind.raw Object grammaro(Iterable t) { + System.out.println("working on " + t); + return MetaGrammar.make(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() { @@ -171,11 +194,11 @@ public class RegressionTests { public static class TestCaseBuilder extends StringWalker { public Object walk(Tree 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 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 = MetaGrammar.make(tree.child(tree.numChildren()-1), "s"); TestCase tc = new TestCase(input, output, grammar, false, false); @@ -193,96 +216,16 @@ public class RegressionTests { } } } - /* - public static class JavaGrammar extends MetaGrammar { - public Object convertLabel(String label) { return new ClassMark(label); } - public Object convertFieldLabel(String label) { return new FieldMark(label); } - - private static class FieldMark { - public final String field; - public FieldMark(String field) { this.field = field; } - public String toString() { return "."+field; } - } - private static class ClassMark { - public final String clazz; - public ClassMark(String clazz) { this.clazz = clazz; } - public String toString() { return clazz+"$"; } - } - - public static Object build(Tree t, Class c) throws Exception { - System.out.println("** build " + c.getName() + " " + t.toPrettyString()); - Object h = t.head(); - if (h instanceof ClassMark) return build2(t, Class.forName(JavaGrammar.class.getName()+"$"+((ClassMark)h).clazz)); - Object o = null; - if (t.numChildren()==0) o = t.head(); - else if (t.head()==null) return build2(t, c); - else if (t.head() instanceof FieldMark) { - return build2(new Tree(null, new Tree[] { t }), c); - } else { - throw new Exception("don't know how to cope: " + c.getName() + " <- " + t.toPrettyString()); - } - return Reflection.rebuild(o, c); - } - private static Object build2(Tree t, Class c) throws Exception { - System.out.println("** build2 " + c.getName() + " " + t.toPrettyString()); - if (!Reflection.isConcrete(c)) { - Field f = c.getField("subclasses"); - if (f==null) throw new Exception("don't know how to cope: " + c.getName() + " <- " + t.toPrettyString()); - Class[] subs = (Class[])f.get(null); - OUTER: for(int i=0; i t2 : t) { - Object o2 = t2.head(); - System.out.println("checking " + o2 + " in " + subs[i].getName()); - if (o2 instanceof FieldMark) { - if (subs[i].getField(((FieldMark)o2).field)==null) continue OUTER; - } - } - c = subs[i]; - break; - } - } - Object o = c.newInstance(); - for(Tree t2 : t) { - Object o2 = t2.head(); - if (o2 instanceof FieldMark) { - FieldMark f = (FieldMark)o2; - Field field = c.getField(ReflectiveWalker.mangle(f.field)); - Object tgt = build(t2.child(0), field.getType()); - System.out.println("setting " + f.field + - " on a " + o.getClass().getName() + - " to " + (tgt==null?"null":tgt.getClass().getName())); - field.set(o, tgt); - } - } - System.out.println("returning a " + o.getClass().getName()); - return o; - } - public static Object build(Tree t) throws Exception { - Object h = t.head(); - if (h instanceof ClassMark) { - ClassMark cm = (ClassMark)h; - Class c = Class.forName(JavaGrammar.class.getName() + "$" + ReflectiveWalker.mangle(cm.clazz)); - return build2(t, c); - } - - return h==null ? null : h.toString(); - } - - public static interface Expr { - public static Class[] subclasses = new Class[] { _plus_.class, num.class }; - } - public static class _plus_ implements Expr { - public Expr left; - public Expr right; - public String toString() { return left + "+" + right; } - } - public static class num implements Expr { - public String val; - public String toString() { return "["+val+"]"; } - } - - } - */ private static String pad(int i,String s) { return s.length() >= i ? s : pad(i-1,s)+" "; } + public static String string(Tree tree) { + String ret = ""; + if (tree.head()!=null) ret += tree.head(); + ret += string(tree.children()); + return ret; + } + public static String string(Iterable> children) { + String ret = ""; + for(Tree t : children) ret += string(t); + return ret; + } } -