checkpoint

[sbp.git] / src / edu / berkeley / sbp / meta / AnnotationGrammarBindingResolver.java

diff --git a/src/edu/berkeley/sbp/meta/AnnotationGrammarBindingResolver.java b/src/edu/berkeley/sbp/meta/AnnotationGrammarBindingResolver.java
index a975832..9ea5d7e 100644 (file)
--- a/src/edu/berkeley/sbp/meta/AnnotationGrammarBindingResolver.java
+++ b/src/edu/berkeley/sbp/meta/AnnotationGrammarBindingResolver.java
@@ -10,7 +10,7 @@ import java.lang.reflect.*;
 import java.io.*;
 
 // FIXME: non-static methods
-public class AnnotationGrammarBindingResolver extends GrammarBindingResolver {
+public class AnnotationGrammarBindingResolver extends Grammar.Bindings {
 
     private static boolean harsh = true;
 
@@ -52,31 +52,20 @@ public class AnnotationGrammarBindingResolver extends GrammarBindingResolver {
 
         p = new Production(suffix, p.elements, p.drops);
         for(Method m : _allMethods.get(prefix))
-            if (new MetaGrammar.TreeBindable(m).isCompatible(p))
-                return new MetaGrammar.TreeBindable(m).makeSequence(p);
+            if (p.isCompatible(m))
+                return p.makeSequence(m);
         for(Class c : _inner.get(prefix))
             for(Constructor con : c.getConstructors())
-                if (new MetaGrammar.TreeBindable(con).isCompatible(p))
-                    return new MetaGrammar.TreeBindable(con).makeSequence(p);
+                if (p.isCompatible(con))
+                    return p.makeSequence(con);
         for(Class c : _inner.get(prefix))
-            if (new MetaGrammar.TreeBindable(c).isCompatible(p))
-                return new MetaGrammar.TreeBindable(c).makeSequence(p);
+            if (p.isCompatible(c))
+                return p.makeSequence(c);
 
         return null;
 
     }
 
-    public Sequence resolveTag(Production p) {
-        Sequence ret = tryResolveTag(p);
-        if (ret != null) return ret;
-        String message = "could not find a Java method/class/ctor matching tag \""+p.tag+
-            "\", nonterminal \""+"???"+"\" with " + p.elements.length + " arguments";
-        if (harsh) {
-            throw new RuntimeException(message);
-        } else {
-            return Sequence.rewritingSequence(p.tag, p.elements, p.drops);
-        }
-    }
 
     // helper