X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Fedu%2Fberkeley%2Fsbp%2Fmeta%2FAnnotationGrammarBindingResolver.java;h=381fafc0f40b339c3c5993903c8eaea90bd976d4;hb=a7ba8d8a5f0cb7fbb5bf67f1a95f1cad5226c507;hp=1955f7fd1bc56fb4679358b039a596da6c34b28c;hpb=f7d5c2384df4e9e586f3c3465a6e6e0f4212115c;p=sbp.git

diff --git a/src/edu/berkeley/sbp/meta/AnnotationGrammarBindingResolver.java b/src/edu/berkeley/sbp/meta/AnnotationGrammarBindingResolver.java
index 1955f7f..381fafc 100644
--- a/src/edu/berkeley/sbp/meta/AnnotationGrammarBindingResolver.java
+++ b/src/edu/berkeley/sbp/meta/AnnotationGrammarBindingResolver.java
@@ -9,54 +9,64 @@ import java.lang.annotation.*;
 import java.lang.reflect.*;
 import java.io.*;
 
+// FIXME: non-static methods
 public class AnnotationGrammarBindingResolver extends GrammarBindingResolver {
 
     private static boolean harsh = true;
 
     private final Class _cl;
     private final Class[] _inner;
-
-    public AnnotationGrammarBindingResolver() {
-        this(MetaGrammarBindings.class);
-    }
+    private final Method[] _allMethods;
 
     public AnnotationGrammarBindingResolver(Class c) {
         this._cl = c;
-        this._inner = c.getDeclaredClasses();
-    }
-
-    public AnnotationGrammarBindingResolver(Class c, Class[] inner) {
-        this._cl = c;
-        this._inner = inner;
+        ArrayList<Class> alc = new ArrayList<Class>();
+        ArrayList<Method> alm = new ArrayList<Method>();
+        add(c, alc, alm);
+        this._inner = (Class[])alc.toArray(new Class[0]);
+        this._allMethods = (Method[])alm.toArray(new Method[0]);
     }
 
-    public Object repeatTag() {
-        return new Tree.ArrayBuildingTreeFunctor<Object>();
-    }
+    public Object repeatTag() { return new Tree.ArrayBuildingTreeFunctor<Object>(); }
 
-    public Sequence tryResolveTag(String tag, String nonTerminalName, Element[] els, Object[] labels, boolean[] drops) {
-        for(Method m : _cl.getMethods())
-            if (new MetaGrammar.Target(m).isCompatible(tag, nonTerminalName, els, labels, drops))
-                return new MetaGrammar.Target(m).makeSequence(tag, nonTerminalName, els, labels, drops);
+    public Sequence tryResolveTag(String tag, String nonTerminalName, Element[] els, boolean[] drops) {
+        MetaGrammar.Production p = new MetaGrammar.Production(tag, nonTerminalName, els, drops);
+        for(Method m : _allMethods)
+            if (new MetaGrammar.Target(m).isCompatible(p))
+                return new MetaGrammar.Target(m).makeSequence(p);
         for(Class c : _inner)
             for(Constructor con : c.getConstructors())
-                if (new MetaGrammar.Target(con).isCompatible(tag, nonTerminalName, els, labels, drops))
-                    return new MetaGrammar.Target(con).makeSequence(tag, nonTerminalName, els, labels, drops);
+                if (new MetaGrammar.Target(con).isCompatible(p))
+                    return new MetaGrammar.Target(con).makeSequence(p);
         for(Class c : _inner)
-            if (new MetaGrammar.Target(c).isCompatible(tag, nonTerminalName, els, labels, drops))
-                return new MetaGrammar.Target(c).makeSequence(tag, nonTerminalName, els, labels, drops);
+            if (new MetaGrammar.Target(c).isCompatible(p))
+                return new MetaGrammar.Target(c).makeSequence(p);
         return null;
     }
-    public Sequence resolveTag(String tag, String nonTerminalName, Element[] els, Object[] labels, boolean[] drops) {
-        Sequence ret = tryResolveTag(tag, nonTerminalName, els, labels, drops);
+    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 {
-            System.err.println(message);
-            return Sequence.rewritingSequence(tag, els, labels, drops);
+            return Sequence.rewritingSequence(tag, els, drops);
         }
     }
+
+    // helper
+
+    private static void add(Class cl, ArrayList<Class> alc, ArrayList<Method> alm) {
+        for(Method m : cl.getDeclaredMethods())
+            alm.add(m);
+        for(Class c : cl.getDeclaredClasses()) {
+            alc.add(c);
+            add(c, alc, alm);
+        }
+        if (cl.getSuperclass() != Object.class)
+            add(cl.getSuperclass(), alc, alm);
+    }
+
 }