X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2Fmeta%2FAnnotationGrammarBindingResolver.java;h=9ea5d7eebdaa9fcaec6006880de940052dcc4215;hb=b1a5513197f7c776706fd5b5618574906f72b707;hp=761b4604a80748f4e568ca1a5eb9984c7bd6e72c;hpb=f699bd804e3216b451aba17bc79f94504ff98612;p=sbp.git

diff --git a/src/edu/berkeley/sbp/meta/AnnotationGrammarBindingResolver.java b/src/edu/berkeley/sbp/meta/AnnotationGrammarBindingResolver.java
index 761b460..9ea5d7e 100644
--- 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;
 
@@ -42,43 +42,30 @@ public class AnnotationGrammarBindingResolver extends GrammarBindingResolver {
 
     public Object repeatTag() { return new Tree.ArrayBuildingTreeFunctor<Object>(); }
 
-    public Sequence tryResolveTag(String tag, String nonTerminalName, Element[] els, boolean[] drops) {
+    public Sequence tryResolveTag(Production p) {
 
-        String key = tag==null?nonTerminalName:tag;
+        String key = p.tag==null?p.nonTerminal:p.tag;
         if (key==null) return null;
 
         String prefix = key.indexOf('.')==-1 ? "" : key.substring(0, key.lastIndexOf('.'));
         String suffix = key.indexOf('.')==-1 ? key : key.substring(key.lastIndexOf('.')+1);
 
-        //System.err.println("suffix = " + suffix);
-        MetaGrammar.Production p = new MetaGrammar.Production(suffix, suffix, els, drops);
+        p = new Production(suffix, p.elements, p.drops);
         for(Method m : _allMethods.get(prefix))
-            if (new MetaGrammar.Target(m).isCompatible(p))
-                return new MetaGrammar.Target(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.Target(con).isCompatible(p))
-                    return new MetaGrammar.Target(con).makeSequence(p);
+                if (p.isCompatible(con))
+                    return p.makeSequence(con);
         for(Class c : _inner.get(prefix))
-            if (new MetaGrammar.Target(c).isCompatible(p))
-                return new MetaGrammar.Target(c).makeSequence(p);
+            if (p.isCompatible(c))
+                return p.makeSequence(c);
 
         return null;
 
     }
 
-    public Sequence resolveTag(String tag, String nonTerminalName, Element[] els, boolean[] drops) {
-        MetaGrammar.Production p = new MetaGrammar.Production(tag, nonTerminalName, els, drops);
-        Sequence ret = tryResolveTag(tag, nonTerminalName, els, drops);
-        if (ret != null) return ret;
-        String message = "could not find a Java method/class/ctor matching tag \""+tag+
-            "\", nonterminal \""+nonTerminalName+"\" with " + els.length + " arguments";
-        if (harsh) {
-            throw new RuntimeException(message);
-        } else {
-            return Sequence.rewritingSequence(tag, els, drops);
-        }
-    }
 
     // helper