X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2Fmisc%2FRegressionTests.java;h=dfe30b63f4f8f85d5893b48d7477fe452f3a06e9;hp=aa12c2a14df622a181f33b3d3699269da7aea5c1;hb=bbb16d2522ed587238fd7a69e346d5e5e8f2551a;hpb=bea819e3a90c7cc18159e43250b3af87602295f8

diff --git a/src/edu/berkeley/sbp/misc/RegressionTests.java b/src/edu/berkeley/sbp/misc/RegressionTests.java
index aa12c2a..dfe30b6 100644
--- a/src/edu/berkeley/sbp/misc/RegressionTests.java
+++ b/src/edu/berkeley/sbp/misc/RegressionTests.java
@@ -13,7 +13,15 @@ public class RegressionTests {
 
     public static boolean yes = false;
     public static boolean graph = false;
-    public static File[] includes = new File[] { new File("tests") };
+    public static GrammarAST.ImportResolver resolver = new GrammarAST.ImportResolver() {
+            public InputStream getImportStream(String importname) {
+                try {
+                    return new FileInputStream("tests/"+importname);
+                } catch (IOException e) {
+                    throw new RuntimeException(e);
+                }
+            }
+        };
 
     public static void main() throws Exception {
         main(new String[] { null, "tests/testcase.g", "tests/regression.tc" });
@@ -35,17 +43,31 @@ public class RegressionTests {
                 s = s2;
             }
 
+            CharParser cp;
+            Tree<String> res;
+
             InputStream metaGrammarStream =
                 s[0] == null
                 ? RegressionTests.class.getClassLoader().getResourceAsStream("edu/berkeley/sbp/meta/meta.g")
                 : new FileInputStream(s[0]);
-            Tree<String> res = new CharParser(MetaGrammar.newInstance()).parse(metaGrammarStream).expand1();
-            Union meta = GrammarAST.buildFromAST(res, "s", includes);
+            res = new CharParser(GrammarAST.getMetaGrammar()).parse(metaGrammarStream).expand1();
+            Union meta = GrammarAST.buildFromAST(res, "s", resolver);
+            cp = new CharParser(meta);
+
+            System.err.println("serializing grammar to grammar.ser...");
+            ObjectOutputStream oos = new ObjectOutputStream(new FileOutputStream("grammar.ser"));
+            oos.writeObject(cp);
+            oos.close();
+
+            System.err.println("deserializing grammar from grammar.ser...");
+            ObjectInputStream ois = new ObjectInputStream(new FileInputStream("grammar.ser"));
+            cp = (CharParser)ois.readObject();
+            ois.close();
 
             System.err.println("parsing " + s[1]);
             res = new CharParser(meta).parse(new FileInputStream(s[1])).expand1();
 
-            Union testcasegrammar = GrammarAST.buildFromAST(res, "s", includes);
+            Union testcasegrammar = GrammarAST.buildFromAST(res, "s", resolver);
             if (testcasegrammar==null) return;
             CharParser parser = new CharParser(testcasegrammar);
 
@@ -66,7 +88,25 @@ public class RegressionTests {
             }
             System.err.println("expanding...");
 
-            TestCase[] expanded = (TestCase[])new GrammarAST(includes, "").walkChildren(r2.expand1());
+            ArrayList<TestCase> cases = new ArrayList<TestCase>();
+            Tree tt = r2.expand1();
+            for(int i=0; i<tt.size(); i++) {
+                Tree t = tt.child(i);
+                String[] expect = !"ignore output;".equals(t.child(2).head()) ? new String[t.child(2).size()] : null;
+                if (expect != null)
+                    for(int j=0; j<t.child(2).size(); j++)
+                        expect[j] = stringifyChildren(t.child(2).child(j));
+                cases.add(new TestCase(stringifyChildren(t.child(0)),
+                                       stringifyChildren(t.child(1)),
+                                       expect,
+                                       GrammarAST.buildFromAST(t.child(3), "s", resolver),
+                                       false,
+                                       false));
+                
+            }
+            TestCase[] expanded = new TestCase[cases.size()];
+            for(int i=0; i<expanded.length; i++)
+                expanded[i] = cases.get(i);
             for(TestCase tc : expanded)
                 tc.execute();
 
@@ -79,8 +119,16 @@ public class RegressionTests {
         }
     }
 
+    private static String stringifyChildren(Tree t) {
+        StringBuffer sb = new StringBuffer();
+        for(int i=0; i<t.size(); i++) {
+            sb.append(t.child(i).head());
+            sb.append(stringifyChildren(t.child(i)));
+        }
+        return sb.toString();
+    }
+
     public static class TestCase {
-        private final boolean tib;
         private final boolean jav;
         public /*final*/ String input;        
         public final String[] output;
@@ -89,16 +137,16 @@ public class RegressionTests {
 
         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;
+            this.output = output;
             this.grammar = grammar;
         }
         public String toString() {
             String ret = "testcase {\n" + "  input \""+input+"\";\n";
-            for(String s : output) ret += "  output \""+s+"\";\n";
+            if (output != null)
+                for(String s : output) ret += "  output \""+s+"\";\n";
             ret += grammar +"\n}\n";
             return ret;
         }
@@ -107,15 +155,9 @@ public class RegressionTests {
             ParseFailed pfe = null;
             CharParser parser = new CharParser(grammar);
             System.out.print("     "+name+"\r");
-            //parser.helpgc = false;
             try {
-                res = tib 
-                    ? /*new CharParser(grammar).parse(new Tib(input))*/ null
-                : parser.parse(new StringReader(input));
-            } catch (ParseFailed pf) {
-                pfe = pf;
-            }
-            //ystem.out.println("res=="+res);
+                res = parser.parse(new StringReader(input));
+            } catch (ParseFailed pf) { pfe = pf; }
 
             if (graph) {
                 FileOutputStream fos = new FileOutputStream("out.dot");
@@ -128,6 +170,10 @@ public class RegressionTests {
                 System.out.println(parser);
             }
 
+            if (output==null) {
+                System.out.println("\r\033[32mDONE\033[0m "+name);
+                return true;
+            }
             Iterable<Tree<String>> results =
                 res==null ? new HashSet<Tree<String>>() : res.expand();