//MetaGrammar mg0 = new MetaGrammar();
//mg0.walk(MetaGrammar.meta);
//System.out.println(mg0);
- Tree<String> res = new Parser(MetaGrammar.make(), CharToken.top()).parse1(new CharToken.Stream(new InputStreamReader(new FileInputStream(s[0]))));
+ Tree<String> 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<String> r2 = parser.parse(cs);
+ System.out.println();
+ System.out.println("elapsed = " + (System.currentTimeMillis()-now) + "ms");
if (profile) {
System.out.println("\ndone");
System.in.read();
return ret;
}
public boolean execute() throws Exception {
- Forest<String> res = new Parser(grammar, CharToken.top()).parse(inp);
+ Forest<String> res = new CharToken.CharToStringParser(grammar).parse(inp);
Collection<Tree<String>> results = res==null ? new HashSet<Tree<String>>() : res.expand(false);
System.out.print("\r");
if (results.size() == 0 && output.length > 0) {
System.out.println("PARSE FAILED");
System.out.print("\033[0m");
} else {
- System.out.println("\r \r");
+ System.out.print("\r \r");
}
HashSet<String> outs = new HashSet<String>();
if (output != null) for(String s : output) outs.add(s.trim());
for (Tree<String> 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;
}
}
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];
- Union grammar = (Union)((MetaGrammar)(new Tib.Grammar().walk(tree, tree.numChildren()-1))).done("s");
- return new TestCase(input, output, grammar, "tibcase".equals(tree.head()));
+ 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) {