X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2Fmisc%2FRegressionTests.java;h=13be93f254169f0f0162a20d5896b8788f48f56f;hp=6fd3dd0df09546babf75aa4d52090bb03cd1c5d6;hb=f17fca21d99030d325624f839efcd17bc93f1548;hpb=8a05c54202f3f5792bbd7146007c6718049fecd9

diff --git a/src/edu/berkeley/sbp/misc/RegressionTests.java b/src/edu/berkeley/sbp/misc/RegressionTests.java
index 6fd3dd0..13be93f 100644
--- a/src/edu/berkeley/sbp/misc/RegressionTests.java
+++ b/src/edu/berkeley/sbp/misc/RegressionTests.java
@@ -37,12 +37,12 @@ public class RegressionTests {
 
             System.err.println("parsing " + s[0]);
             Tree<String> res = new CharParser(MetaGrammar.newInstance()).parse(new FileInputStream(s[0])).expand1();
-            Union meta = GrammarBuilder.buildFromAST(res, "s", includes);
+            Union meta = GrammarAST.buildFromAST(res, "s", includes);
 
             System.err.println("parsing " + s[1]);
             res = new CharParser(meta).parse(new FileInputStream(s[1])).expand1();
 
-            Union testcasegrammar = GrammarBuilder.buildFromAST(res, "s", includes);
+            Union testcasegrammar = GrammarAST.buildFromAST(res, "s", includes);
             if (testcasegrammar==null) return;
             CharParser parser = new CharParser(testcasegrammar);
 
@@ -63,7 +63,7 @@ public class RegressionTests {
             }
             System.err.println("expanding...");
 
-            TestCase[] expanded = (TestCase[])new GrammarBuilder(includes, "").walkChildren(r2.expand1());
+            TestCase[] expanded = (TestCase[])new GrammarAST(includes, "").walkChildren(r2.expand1());
             for(TestCase tc : expanded)
                 tc.execute();