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 8a469f6..a975832 100644 (file)
--- a/src/edu/berkeley/sbp/meta/AnnotationGrammarBindingResolver.java
+++ b/src/edu/berkeley/sbp/meta/AnnotationGrammarBindingResolver.java
@@ -42,40 +42,39 @@ 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);
 
-        MetaGrammar.Production p = new MetaGrammar.Production(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 (new MetaGrammar.TreeBindable(m).isCompatible(p))
+                return new MetaGrammar.TreeBindable(m).makeSequence(p);
         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 (new MetaGrammar.TreeBindable(con).isCompatible(p))
+                    return new MetaGrammar.TreeBindable(con).makeSequence(p);
         for(Class c : _inner.get(prefix))
-            if (new MetaGrammar.Target(c).isCompatible(p))
-                return new MetaGrammar.Target(c).makeSequence(p);
+            if (new MetaGrammar.TreeBindable(c).isCompatible(p))
+                return new MetaGrammar.TreeBindable(c).makeSequence(p);
 
         return null;
 
     }
 
-    public Sequence resolveTag(String tag, String nonTerminalName, Element[] els, boolean[] drops) {
-        MetaGrammar.Production p = new MetaGrammar.Production(tag==null ? nonTerminalName : tag, els, drops);
-        Sequence ret = tryResolveTag(tag, nonTerminalName, els, drops);
+    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 \""+tag+
-            "\", nonterminal \""+nonTerminalName+"\" with " + els.length + " arguments";
+        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(tag, els, drops);
+            return Sequence.rewritingSequence(p.tag, p.elements, p.drops);
         }
     }