X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2Fmisc%2FRegressionTests.java;h=897604361a13435057bcdb8a19593abbf916bb72;hp=33e17acc82cdadbf1e175d957babd87e5e120c9b;hb=5fa948c7db9597445448194418537a1c74f46a27;hpb=9e1149086929874c9e7bd09daaef22f55432f750

diff --git a/src/edu/berkeley/sbp/misc/RegressionTests.java b/src/edu/berkeley/sbp/misc/RegressionTests.java
index 33e17ac..8976043 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" });
@@ -40,12 +48,12 @@ public class RegressionTests {
                 ? RegressionTests.class.getClassLoader().getResourceAsStream("edu/berkeley/sbp/meta/meta.g")
                 : new FileInputStream(s[0]);
             Tree<String> res = new CharParser(GrammarAST.getMetaGrammar()).parse(metaGrammarStream).expand1();
-            Union meta = GrammarAST.buildFromAST(res, "s", includes);
+            Union meta = GrammarAST.buildFromAST(res, "s", resolver);
 
             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);
 
@@ -76,7 +84,7 @@ public class RegressionTests {
                 cases.add(new TestCase(stringifyChildren(t.child(0)),
                                        stringifyChildren(t.child(1)),
                                        expect,
-                                       GrammarAST.buildFromAST(t.child(3), "s", includes),
+                                       GrammarAST.buildFromAST(t.child(3), "s", resolver),
                                        false,
                                        false));