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

diff --git a/src/edu/berkeley/sbp/meta/AnnotationGrammarBindingResolver.java b/src/edu/berkeley/sbp/meta/AnnotationGrammarBindingResolver.java
index ee01a45..8601ee7 100644
--- a/src/edu/berkeley/sbp/meta/AnnotationGrammarBindingResolver.java
+++ b/src/edu/berkeley/sbp/meta/AnnotationGrammarBindingResolver.java
@@ -15,58 +15,82 @@ public class AnnotationGrammarBindingResolver extends GrammarBindingResolver {
     private static boolean harsh = true;
 
     private final Class _cl;
-    private final Class[] _inner;
-    private final Method[] _allMethods;
+    private HashMap<String,Class[]> _inner = new HashMap<String,Class[]>();
+    private HashMap<String,Method[]> _allMethods = new HashMap<String,Method[]>();
 
     public AnnotationGrammarBindingResolver(Class c) {
         this._cl = c;
+        add(c, "");
+    }
+
+    public void add(Class c, String prefix) {
+
         ArrayList<Class> alc = new ArrayList<Class>();
+        if (_inner.get(prefix) != null)
+            for(Class cc : _inner.get(prefix))
+                alc.add(cc);
+
         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]);
+        if (_allMethods.get(prefix) != null)
+            for(Method m : _allMethods.get(prefix))
+                alm.add(m);
+
+        add(c, alc, alm, prefix);
+        this._inner.put(prefix, (Class[])alc.toArray(new Class[0]));
+        this._allMethods.put(prefix, (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);
-        for(Method m : _allMethods)
+    public Sequence tryResolveTag(String tag, String nonTerminalName, Element[] els, boolean[] drops) {
+
+        String key = tag==null?nonTerminalName: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, suffix, els, drops);
+        for(Method m : _allMethods.get(prefix))
             if (new MetaGrammar.Target(m).isCompatible(p))
                 return new MetaGrammar.Target(m).makeSequence(p);
-        for(Class c : _inner)
+        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);
-        for(Class c : _inner)
+        for(Class c : _inner.get(prefix))
             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) {
-        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);
     }
 
 }