X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2Fmisc%2FRegressionTests.java;h=d157de92949b3bfefddedc3b3c2ad2a6333346ee;hp=bf63c11df2d527b717d9380ddae7af4291725405;hb=92fb8d7453b3caad1471d84dd452f5ec07785e5e;hpb=54a6a6e983c3883720b22fe0bef998d309f92097

diff --git a/src/edu/berkeley/sbp/misc/RegressionTests.java b/src/edu/berkeley/sbp/misc/RegressionTests.java
index bf63c11..d157de9 100644
--- a/src/edu/berkeley/sbp/misc/RegressionTests.java
+++ b/src/edu/berkeley/sbp/misc/RegressionTests.java
@@ -90,25 +90,25 @@ public class RegressionTests {
         }
     }
 
-    public static class TestCaseMaker extends ReflectiveMeta {
+    public static class TestCaseMaker extends AnnotationGrammarBindingResolver {
         public TestCaseMaker() {
             super(TestCaseMakerHelper.class, new Class[] {
-                     MG.Grammar.class,
-                     MG.NonTerminal.class,
-                     MG.AnonUn.class,
-                     MG.Range.class,
-                     MG.El.class,
-                     MG.Seq.class,
-                     MG.NonTerminalReference.class,
-                     MG.StringLiteral.class,
-                     MG.XTree.class,
-                     MG.CharClass.class
+                     MetaGrammarBindings.Grammar.class,
+                     MetaGrammarBindings.NonTerminal.class,
+                     MetaGrammarBindings.AnonUn.class,
+                     MetaGrammarBindings.Range.class,
+                     MetaGrammarBindings.El.class,
+                     MetaGrammarBindings.Seq.class,
+                     MetaGrammarBindings.NonTerminalReference.class,
+                     MetaGrammarBindings.StringLiteral.class,
+                     MetaGrammarBindings.XTree.class,
+                     MetaGrammarBindings.CharClass.class
             });
         }
-        public static class TestCaseMakerHelper extends MG {
+        public static class TestCaseMakerHelper extends MetaGrammarBindings {
             public static @bind.as("grammaro") @bind.raw Object grammaro(Iterable<Tree> t) {
                 System.out.println("working on " + t);
-                return MetaGrammar.make(t.iterator().next(), "s", new ReflectiveMetaPlain());
+                return MetaGrammar.make(t.iterator().next(), "s", new GrammarBindingResolver());
             }
             //public static @bind.as("tca")           Object tca(Object[] o) throws IOException {
             //return new TestCase((String)o[0], (String[])o[1], (Union)o[2], false, false); }