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 825dc56..f3af6df 100644 (file)
--- a/src/edu/berkeley/sbp/meta/AnnotationGrammarBindingResolver.java
+++ b/src/edu/berkeley/sbp/meta/AnnotationGrammarBindingResolver.java
@@ -9,34 +9,35 @@ 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 Class[] _inner = new Class[0];
+    private Method[] _allMethods = new Method[0];
 
     public AnnotationGrammarBindingResolver(Class c) {
         this._cl = c;
-        this._inner = c.getDeclaredClasses();
+        add(c, "");
     }
 
-    public AnnotationGrammarBindingResolver(Class c, Class[] inner) {
-        this._cl = c;
-        this._inner = inner;
+    public void add(Class c, String prefix) {
+        ArrayList<Class> alc = new ArrayList<Class>();
+        for(Class cc : _inner) alc.add(cc);
+        ArrayList<Method> alm = new ArrayList<Method>();
+        for(Method m : _allMethods) alm.add(m);
+        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) {
-        MetaGrammar.Production p = new MetaGrammar.Production(tag, nonTerminalName, els, labels, drops);
-        for(Method m : _cl.getMethods())
+    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)
@@ -48,17 +49,31 @@ public class AnnotationGrammarBindingResolver extends GrammarBindingResolver {
                 return new MetaGrammar.Target(c).makeSequence(p);
         return null;
     }
-    public Sequence resolveTag(String tag, String nonTerminalName, Element[] els, Object[] labels, boolean[] drops) {
-        MetaGrammar.Production p = new MetaGrammar.Production(tag, nonTerminalName, els, labels, 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, String prefix) {
+        if (cl==null) return;
+        for(Method m : cl.getDeclaredMethods())
+            alm.add(m);
+        for(Class c : cl.getDeclaredClasses()) {
+            alc.add(c);
+            add(c, alc, alm, prefix);
+        }
+        if (cl.getSuperclass() != Object.class)
+            add(cl.getSuperclass(), alc, alm, prefix);
+    }
+
 }