X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2Fmisc%2FRegressionTests.java;h=943c6118c03d883d112afd2eba7d6d543b5e5225;hp=e61673aefc0e24cda20d5d5bdf7536d63dcd97b6;hb=e2a835683bc6f2f873b17710ba85806720f88127;hpb=c1325de42a4ddfad3ff9b10bfdda11078e38e8a6

diff --git a/src/edu/berkeley/sbp/misc/RegressionTests.java b/src/edu/berkeley/sbp/misc/RegressionTests.java
index e61673a..943c611 100644
--- a/src/edu/berkeley/sbp/misc/RegressionTests.java
+++ b/src/edu/berkeley/sbp/misc/RegressionTests.java
@@ -2,40 +2,8 @@ package edu.berkeley.sbp.misc;
 import java.io.*;
 import java.util.*;
 import edu.berkeley.sbp.*;
-import edu.berkeley.sbp.*;
 import edu.berkeley.sbp.misc.*;
-import edu.berkeley.sbp.*;
-
-// priorities are all messy and dont get serialized
-// 1. Error messages
-// 2. Java MetaGrammar (proof of concept)
-// 3. Ivan's MetaGrammar
-// 4. Documentation format
-//       - TIB
-
-// TODO: better API for interfacing with Java
-// TODO: error messages
-// TODO: integrate with TIB
-
-// Element
-// Walk
-// ParseTable / GSS
-// MetaGrammar (necessary/relevant?)
-// Tree<String> (cleanup?)
-// Union.SubUnion
-// Repeat
-
-// FEATURE: serialization of ParseTable's, generation of Java code
-// FEATURE: infer reject elements for literals
-// FEATURE: prefer whitespace higher up
-// FEATURE: full conjunctive and boolean grammars
-// FEATURE: "ambiguity modulo dropped fragments"?  can this be checked for statically?  eliminated statically?
-//            - drop stuff during the parsing process (drop nodes)
-
-// LATER: Element<A> -- parameterize over the input token type?  Makes a huge mess...
-// LATER: Go back to where Sequence is not an Element?
-//            - The original motivation for making Sequence "first class" was the fact that 
-//              in order to do associativity right you need to have per-Sequence follow sets
+import edu.berkeley.sbp.tib.*;
 
 public class RegressionTests {
 
@@ -65,8 +33,13 @@ public class RegressionTests {
                 s = s2;
             }
 
+            //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]))));
-            Union meta = ((MetaGrammar)new MetaGrammar().walk(res)).done();
+            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]));
             Union testcasegrammar = ((MetaGrammar)new MetaGrammar("ts").walk(res)).done("ts");
@@ -96,10 +69,14 @@ public class RegressionTests {
     }
 
     public static class TestCase {
+        private final Token.Stream inp;
         public final String input;
         public final String[] output;
         public final Union grammar;
-        public TestCase(String input, String[] output, Union grammar) {
+        public TestCase(String input, String[] output, Union grammar, boolean tib) throws IOException {
+            this.inp = tib
+                ? new Tib(input)
+                : new CharToken.Stream(new StringReader(input), input.indexOf('\n')==-1?"\""+input+"\": ":"");
             this.input = input;
             this.output = output;
             this.grammar = grammar;
@@ -111,8 +88,7 @@ public class RegressionTests {
             return ret;
         }
         public boolean execute() throws Exception {
-            Forest<String> res = new Parser(grammar,
-                                            CharToken.top()).parse(new CharToken.Stream(new StringReader(input), input.indexOf('\n')==-1?"\""+input+"\": ":""));
+            Forest<String> res = new Parser(grammar, CharToken.top()).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) {
@@ -123,7 +99,7 @@ public class RegressionTests {
                 System.out.println("\r                                                                                                              \r");
             }
             HashSet<String> outs = new HashSet<String>();
-            for(String s : output) outs.add(s.trim());
+            if (output != null) for(String s : output) outs.add(s.trim());
             boolean bad = false;
             for (Tree<String> r : results) {
                 String s = r.toString().trim();
@@ -147,16 +123,21 @@ public class RegressionTests {
     }
 
     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) { return new TestCase(input, output, grammar); }
-        public MetaGrammar grammar(Object[] o) { return this; }
-        public Object walk(String tag, Object[] args) {
-            if ("testcase".equals(tag)) {
-                if (args.length==2) return testcase((String)args[0], new String[0], (Union)args[1]); 
-                return testcase((String)args[0], (String[])args[1], (Union)args[2]); }
-            else if ("grammar".equals(tag)) return done("s");
-            else return super.walk(tag, args);
+        public Object walk(Tree<String> 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];
+                    Union grammar = (Union)walk(tree, tree.numChildren()-1);
+                    return new TestCase(input, output, grammar, "tibcase".equals(tree.head()));
+                } else if ("ts".equals(tree.head())) return walk(tree, 0);
+                else return super.walk(tree);
+            } catch (Exception e) {
+                throw new Error(e);
+            }
         }
     }