move meta.g into src/, cleanup

[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 690d833..aa12c2a 100644 (file)
--- a/src/edu/berkeley/sbp/misc/RegressionTests.java
+++ b/src/edu/berkeley/sbp/misc/RegressionTests.java
@@ -16,7 +16,7 @@ public class RegressionTests {
     public static File[] includes = new File[] { new File("tests") };
 
     public static void main() throws Exception {
-        main(new String[] { "tests/meta.g", "tests/testcase.g", "tests/regression.tc" });
+        main(new String[] { null, "tests/testcase.g", "tests/regression.tc" });
     }
 
     public static void main(String[] s) throws Exception {
@@ -35,8 +35,11 @@ public class RegressionTests {
                 s = s2;
             }
 
-            System.err.println("parsing " + s[0]);
-            Tree<String> res = new CharParser(MetaGrammar.newInstance()).parse(new FileInputStream(s[0])).expand1();
+            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);
 
             System.err.println("parsing " + s[1]);