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

diff --git a/src/edu/berkeley/sbp/misc/RegressionTests.java b/src/edu/berkeley/sbp/misc/RegressionTests.java
index eae22d1..dfe30b6 100644
--- a/src/edu/berkeley/sbp/misc/RegressionTests.java
+++ b/src/edu/berkeley/sbp/misc/RegressionTests.java
@@ -43,18 +43,22 @@ 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(GrammarAST.getMetaGrammar()).parse(metaGrammarStream).expand1();
+            res = new CharParser(GrammarAST.getMetaGrammar()).parse(metaGrammarStream).expand1();
             Union meta = GrammarAST.buildFromAST(res, "s", resolver);
-            CharParser cp = new CharParser(meta);
+            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();
@@ -88,9 +92,10 @@ public class RegressionTests {
             Tree tt = r2.expand1();
             for(int i=0; i<tt.size(); i++) {
                 Tree t = tt.child(i);
-                String[] expect = new String[t.child(2).size()];
-                for(int j=0; j<t.child(2).size(); j++)
-                    expect[j] = stringifyChildren(t.child(2).child(j));
+                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,
@@ -135,12 +140,13 @@ public class RegressionTests {
             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;
         }
@@ -164,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();