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

diff --git a/src/edu/berkeley/sbp/meta/AnnotationGrammarBindingResolver.java b/src/edu/berkeley/sbp/meta/AnnotationGrammarBindingResolver.java
index 381fafc..9ea5d7e 100644
--- a/src/edu/berkeley/sbp/meta/AnnotationGrammarBindingResolver.java
+++ b/src/edu/berkeley/sbp/meta/AnnotationGrammarBindingResolver.java
@@ -10,63 +10,75 @@ import java.lang.reflect.*;
 import java.io.*;
 
 // FIXME: non-static methods
-public class AnnotationGrammarBindingResolver extends GrammarBindingResolver {
+public class AnnotationGrammarBindingResolver extends Grammar.Bindings {
 
     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, 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)
+    public Sequence tryResolveTag(Production p) {
+
+        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);
+
+        p = new Production(suffix, p.elements, p.drops);
+        for(Method m : _allMethods.get(prefix))
+            if (p.isCompatible(m))
+                return p.makeSequence(m);
+        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)
-            if (new MetaGrammar.Target(c).isCompatible(p))
-                return new MetaGrammar.Target(c).makeSequence(p);
+                if (p.isCompatible(con))
+                    return p.makeSequence(con);
+        for(Class c : _inner.get(prefix))
+            if (p.isCompatible(c))
+                return p.makeSequence(c);
+
         return null;
+
     }
-    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, 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);
     }
 
 }