preliminary support for serialization of parse tables

[sbp.git] / src / edu / berkeley / sbp / misc / RegressionTests.java

diff --git a/src/edu/berkeley/sbp/misc/RegressionTests.java b/src/edu/berkeley/sbp/misc/RegressionTests.java
index d85630e..dfe30b6 100644 (file)
--- 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();
@@ -62,9 +66,6 @@ public class RegressionTests {
 
             System.err.println("parsing " + s[1]);
             res = new CharParser(meta).parse(new FileInputStream(s[1])).expand1();
-            
-            // uncomment this when I get serialization working
-            //res = cp.parse(new FileInputStream(s[1])).expand1();
 
             Union testcasegrammar = GrammarAST.buildFromAST(res, "s", resolver);
             if (testcasegrammar==null) return;