X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2Fmisc%2FRegressionTests.java;h=a3d471d67b3c542cff283468c838f7388268f474;hp=8d165ff0cb3463c51522f49fe4956a3c7b52a3a1;hb=526da96dd06e152d194ec92c9ef9df6085a1251b;hpb=0907ad8065e0d123e46fd00d87189a2fa9f10bf4 diff --git a/src/edu/berkeley/sbp/misc/RegressionTests.java b/src/edu/berkeley/sbp/misc/RegressionTests.java index 8d165ff..a3d471d 100644 --- a/src/edu/berkeley/sbp/misc/RegressionTests.java +++ b/src/edu/berkeley/sbp/misc/RegressionTests.java @@ -8,20 +8,6 @@ import edu.berkeley.sbp.tib.*; public class RegressionTests { public static boolean yes = false; - public static class MyWalker extends ReflectiveWalker { - public String top(Object[] o) { return "top("+join(o)+")"; } - public String str(String[] s) { String ret = ""; for(String st : s) ret += st; return ret; } - public String join(Object[] o) { String ret = ""; for(Object st : o) ret += st; return ret; } - public String whilex(Object s, Object y) { return "while("+s+") " + y; } - public String seq(Object[] statements) { - String ret = ""; - for(Object s : statements) ret += s + ";\n"; - return ret; - } - /* - public String bl(String s) { return "{" + s + "}"; } - */ - }; public static void main(String[] s) throws Exception { try { @@ -36,22 +22,26 @@ public class RegressionTests { //MetaGrammar mg0 = new MetaGrammar(); //mg0.walk(MetaGrammar.meta); //System.out.println(mg0); - Tree res = new Parser(MetaGrammar.make(), CharToken.top()).parse1(new CharToken.Stream(new InputStreamReader(new FileInputStream(s[0])))); + Tree res = new CharToken.CharToStringParser(MetaGrammar.make()).parse1(new CharToken.Stream(new InputStreamReader(new FileInputStream(s[0])))); MetaGrammar mg = (MetaGrammar)new MetaGrammar().walk(res); //System.out.println(mg); Union meta = mg.done(); SequenceInputStream sis = new SequenceInputStream(new FileInputStream(s[0]), new FileInputStream(s[1])); - res = new Parser(meta, CharToken.top()).parse1(new CharToken.Stream(new InputStreamReader(sis), "parsing " + s[1] + " using " + s[0])); + res = new CharToken.CharToStringParser(meta).parse1(new CharToken.Stream(new InputStreamReader(sis), "parsing " + s[1] + " using " + s[0])); Union testcasegrammar = ((MetaGrammar)new MetaGrammar("ts").walk(res)).done("ts"); if (testcasegrammar==null) return; CharToken.Stream cs = new CharToken.Stream(new InputStreamReader(new FileInputStream(s[2])), "parsing " + s[2] + " using " + s[1]); - Parser parser = new Parser(testcasegrammar, CharToken.top()); + Parser parser = new CharToken.CharToStringParser(testcasegrammar); if (profile) { System.out.println("\nready..."); System.in.read(); } + System.gc(); + long now = System.currentTimeMillis(); Forest r2 = parser.parse(cs); + System.out.println(); + System.out.println("elapsed = " + (System.currentTimeMillis()-now) + "ms"); if (profile) { System.out.println("\ndone"); System.in.read(); @@ -88,15 +78,23 @@ public class RegressionTests { return ret; } public boolean execute() throws Exception { - Forest res = new Parser(grammar, CharToken.top()).parse(inp); + Forest res = null; + Parser.Failed pfe = null; + try { + res = new CharToken.CharToStringParser(grammar).parse(inp); + } catch (Parser.Failed pf) { + pfe = pf; + } + //ystem.out.println("res=="+res); Collection> results = res==null ? new HashSet>() : res.expand(false); System.out.print("\r"); if (results.size() == 0 && output.length > 0) { System.out.print("\033[31m"); System.out.println("PARSE FAILED"); System.out.print("\033[0m"); + if (pfe != null) pfe.printStackTrace(); } else { - System.out.println("\r \r"); + System.out.print("\r \r"); } HashSet outs = new HashSet(); if (output != null) for(String s : output) outs.add(s.trim()); @@ -104,40 +102,44 @@ public class RegressionTests { for (Tree r : results) { String s = r.toString().trim(); if (outs.contains(s)) { outs.remove(s); continue; } + if (!bad) System.out.println(input); System.out.print("\033[33m"); System.out.println(" GOT: " + s); bad = true; } for(String s : outs) { + if (!bad) System.out.println(input); System.out.print("\033[31m"); System.out.println("EXPECTED: " + s); bad = true; } if (bad) { - System.out.print("\033[0m"); + System.out.println("\033[0m"); return true; } - System.out.println("\033[32mPASS\033[0m"); + System.out.println("\r\033[32mPASS\033[0m "); return false; } } public static class TestCaseBuilder extends MetaGrammar { - public TestCase[] ts(Object o1, TestCase[] ts, Object o2) { return ts; } - public TestCase[] ts(TestCase[] ts) { return ts; } - public TestCase testcase(String input, String[] output, Union grammar) throws IOException { - return new TestCase(input, output, grammar, false); } - public TestCase testcase(String input, Union grammar) throws IOException { - return new TestCase(input, new String[0], grammar, false); } - public TestCase tibcase(String input, Union grammar) throws IOException { - return new TestCase(input, new String[0], grammar, true); } - public MetaGrammar grammar(Object[] o) { return this; } - public Object walk(String tag, Object[] args) { - if ("grammar".equals(tag)) { - System.out.println("\n" + this + "\n"); - return done("s"); + public Object walk(Tree tree) { + try { + if ("grammar".equals(tree.head())) { walkChildren(tree); return done("s"); } + else if ("output".equals(tree.head())) return string(tree.children()); + else if ("input".equals(tree.head())) return string(tree.children()); + else if ("tibcase".equals(tree.head()) || "testcase".equals(tree.head())) { + String input = string(tree.child(0)); + String[] output = tree.numChildren()>2 ? ((String[])walk(tree, 1)) : new String[0]; + boolean tib = "tibcase".equals(tree.head()); + MetaGrammar gram = tib ? new Tib.Grammar() : new MetaGrammar(); + Union grammar = (Union)((MetaGrammar)(gram.walk(tree, tree.numChildren()-1))).done("s"); + return new TestCase(input, output, grammar, tib); + } else if ("ts".equals(tree.head())) return walk(tree, 0); + else return super.walk(tree); + } catch (Exception e) { + throw new Error(e); } - else return super.walk(tag, args); } }