X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2Fmeta%2FAnnotationGrammarBindingResolver.java;h=f3af6dfac66b3f1b4179906532b92f6a2c1ff08c;hp=ee01a45eb2ca0e1b301ee2424dfbcad4aedd73e4;hb=11fb48ff93c4fad499e4110e4aa8883357963f6e;hpb=41b74cd8469abb0bdff811f26594a7ef87cb26a6

diff --git a/src/edu/berkeley/sbp/meta/AnnotationGrammarBindingResolver.java b/src/edu/berkeley/sbp/meta/AnnotationGrammarBindingResolver.java
index ee01a45..f3af6df 100644
--- a/src/edu/berkeley/sbp/meta/AnnotationGrammarBindingResolver.java
+++ b/src/edu/berkeley/sbp/meta/AnnotationGrammarBindingResolver.java
@@ -15,22 +15,28 @@ public class AnnotationGrammarBindingResolver extends GrammarBindingResolver {
     private static boolean harsh = true;
 
     private final Class _cl;
-    private final Class[] _inner;
-    private final Method[] _allMethods;
+    private Class[] _inner = new Class[0];
+    private Method[] _allMethods = new Method[0];
 
     public AnnotationGrammarBindingResolver(Class c) {
         this._cl = c;
+        add(c, "");
+    }
+
+    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>();
-        add(c, alc, alm);
+        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 Sequence tryResolveTag(String tag, String nonTerminalName, Element[] els, Object[] labels, boolean[] drops) {
-        MetaGrammar.Production p = new MetaGrammar.Production(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);
@@ -43,30 +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 {
-            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) {
+    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);
+            add(c, alc, alm, prefix);
         }
         if (cl.getSuperclass() != Object.class)
-            add(cl.getSuperclass(), alc, alm);
+            add(cl.getSuperclass(), alc, alm, prefix);
     }
 
 }