X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2Fmisc%2FRegressionTests.java;h=d57959056b5baa39f181eb8286dbbcfc26e5ef56;hp=677f7dda6e66692726a6cd9bcb0c509f5cf46001;hb=f8adfc66d98670be6553965d7ee9e6c998a4e0a6;hpb=7dd51387ce4308d3784a1291604203aaf677ba16 diff --git a/src/edu/berkeley/sbp/misc/RegressionTests.java b/src/edu/berkeley/sbp/misc/RegressionTests.java index 677f7dd..d579590 100644 --- a/src/edu/berkeley/sbp/misc/RegressionTests.java +++ b/src/edu/berkeley/sbp/misc/RegressionTests.java @@ -7,7 +7,6 @@ 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.*; @@ -18,7 +17,7 @@ public class RegressionTests { public static boolean graph = false; public static void main() throws Exception { - main(new String[] { "tests/meta.g", "tests/testcase.g", "tests/regression.tc" }); + main(new String[] { "tests/meta.g", "tests/testcase.g", "tests/regression.tc" }); } public static void main(String[] s) throws Exception { @@ -39,13 +38,12 @@ public class RegressionTests { System.err.println("parsing " + s[0]); Tree res = new CharParser(MetaGrammar.newInstance()).parse(new FileInputStream(s[0])).expand1(); - Union meta = Grammar.create(res, "s", new MetaGrammarBindings()); + 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(new FileInputStream(s[1])).expand1(); - Union testcasegrammar = Grammar.create(res, "ts", new TestCaseMaker()); + Union testcasegrammar = Grammar.create(res, "s"); if (testcasegrammar==null) return; CharParser parser = new CharParser(testcasegrammar); @@ -66,25 +64,9 @@ public class RegressionTests { } System.err.println("expanding..."); - Tree t = r2.expand1(); - TestCase[] expanded = (TestCase[])((Functor)t.head()).invoke(t); - System.err.println("executing..."); - for(TestCase tc : expanded) { + TestCase[] expanded = (TestCase[])new GrammarBuilder("tests/", "").walkChildren(r2.expand1()); + for(TestCase tc : expanded) tc.execute(); - /* - String st = "a"; - for(int i=0; i<12; i++) { - //System.out.println("length " + st.length()); - tc.input = st; - long nowy = System.currentTimeMillis(); - GSS.shifts = 0; - GSS.reductions = 0; - tc.execute(); - System.out.println("length " + st.length() + " => " + ((System.currentTimeMillis()-nowy)/1000.0) + " " + GSS.shifts + " " + GSS.reductions); - st = st+st; - } - */ - } } catch (Throwable t) { System.err.println("\n\nexception thrown, class == " + t.getClass().getName()); @@ -95,36 +77,18 @@ public class RegressionTests { } } - public static class TestCaseMaker extends AnnotationGrammarBindings { - public TestCaseMaker() { - super(TestCaseMakerHelper.class); - add(MetaGrammarBindings.class, "grammar"); - //add(MetaGrammarBindings.class, ""); - } - public static class TestCaseMakerHelper { - public static @bind.as("grammaro") @bind.raw Object grammaro(Iterable t) { - 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); } - 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 final String name; - public TestCase(String input, String[] output, Union grammar, boolean tib, boolean jav) throws IOException { + public TestCase(String name, String input, String[] output, + Union grammar, boolean tib, boolean jav) { this.tib = tib; + this.name = name; this.jav = jav; this.input = input; this.output = output==null ? new String[0] : output; @@ -140,6 +104,7 @@ public class RegressionTests { Forest res = null; ParseFailed pfe = null; CharParser parser = new CharParser(grammar); + System.out.print(" "+name+"\r"); //parser.helpgc = false; try { res = tib @@ -167,8 +132,8 @@ public class RegressionTests { System.out.print("\r"); if (results == null || (results.size() == 0 && (output!=null && output.length > 0))) { System.out.print("\033[31m"); - System.out.println("PARSE FAILED"); - System.out.print("\033[0m"); + System.out.print("FAIL "); + System.out.println("\033[0m "+name); if (pfe != null) pfe.printStackTrace(); } else { System.out.print("\r \r"); @@ -194,37 +159,12 @@ public class RegressionTests { System.out.println("\033[0m"); return true; } - System.out.println("\r\033[32mPASS\033[0m "); + System.out.println("\r\033[32mPASS\033[0m "+name); return false; } } - public static class TestCaseBuilder extends StringWalker { - public Object walk(Tree tree) { - try { - 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.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.size()]; - for(int i=0; i= i ? s : pad(i-1,s)+" "; } public static String string(Tree tree) { String ret = "";