X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2Fmisc%2FRegressionTests.java;h=690d833c855e41bfdcc3e38b08f55f6b4449d396;hp=6fd3dd0df09546babf75aa4d52090bb03cd1c5d6;hb=5eea0a7ad35fb17a5b7203fa40119ad5cab01ec0;hpb=dc9bb3a45ed306e2e35549076842b3e74efecb48 diff --git a/src/edu/berkeley/sbp/misc/RegressionTests.java b/src/edu/berkeley/sbp/misc/RegressionTests.java index 6fd3dd0..690d833 100644 --- a/src/edu/berkeley/sbp/misc/RegressionTests.java +++ b/src/edu/berkeley/sbp/misc/RegressionTests.java @@ -1,4 +1,4 @@ -// Copyright 2006 all rights reserved; see LICENSE file for BSD-style license +// Copyright 2006-2007 all rights reserved; see LICENSE file for BSD-style license package edu.berkeley.sbp.misc; import java.io.*; @@ -37,12 +37,12 @@ public class RegressionTests { System.err.println("parsing " + s[0]); Tree 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();