checkpoint

darcs-hash:20060713215720-5007d-b400f014e47f3162886d7fab34638c73b8de72b9.gz

diff --git a/src/edu/berkeley/sbp/meta/AnnotationGrammarBindingResolver.java b/src/edu/berkeley/sbp/meta/AnnotationGrammarBindingResolver.java
index f3af6df..3585116 100644 (file)
--- a/src/edu/berkeley/sbp/meta/AnnotationGrammarBindingResolver.java
+++ b/src/edu/berkeley/sbp/meta/AnnotationGrammarBindingResolver.java
@@ -15,8 +15,8 @@ public class AnnotationGrammarBindingResolver extends GrammarBindingResolver {
     private static boolean harsh = true;
 
     private final Class _cl;
     private static boolean harsh = true;
 
     private final Class _cl;

-    private Class[] _inner = new Class[0];
-    private Method[] _allMethods = new Method[0];
+    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;
 
     public AnnotationGrammarBindingResolver(Class c) {
         this._cl = c;

@@ -24,31 +24,48 @@ public class AnnotationGrammarBindingResolver extends GrammarBindingResolver {
     }
 
     public void add(Class c, String prefix) {
     }
 
     public void add(Class c, String prefix) {

+

         ArrayList<Class> alc = new ArrayList<Class>();
         ArrayList<Class> alc = new ArrayList<Class>();

-        for(Class cc : _inner) alc.add(cc);
+        if (_inner.get(prefix) != null)
+            for(Class cc : _inner.get(prefix))
+                alc.add(cc);
+

         ArrayList<Method> alm = new ArrayList<Method>();
         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]);
+        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) {
     }
 
     public Object repeatTag() { return new Tree.ArrayBuildingTreeFunctor<Object>(); }
 
     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(tag, nonTerminalName, els, drops);
         MetaGrammar.Production p = new MetaGrammar.Production(tag, nonTerminalName, els, drops);

-        for(Method m : _allMethods)
+        for(Method m : _allMethods.get(prefix))

             if (new MetaGrammar.Target(m).isCompatible(p))
                 return new MetaGrammar.Target(m).makeSequence(p);
             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(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);
             if (new MetaGrammar.Target(c).isCompatible(p))
                 return new MetaGrammar.Target(c).makeSequence(p);

+

         return null;
         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);
     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);

diff --git a/src/edu/berkeley/sbp/misc/RegressionTests.java b/src/edu/berkeley/sbp/misc/RegressionTests.java
index 302e5a2..fd76e77 100644 (file)
--- a/src/edu/berkeley/sbp/misc/RegressionTests.java
+++ b/src/edu/berkeley/sbp/misc/RegressionTests.java
@@ -93,8 +93,10 @@ public class RegressionTests {
     public static class TestCaseMaker extends AnnotationGrammarBindingResolver {
         public TestCaseMaker() {
             super(TestCaseMakerHelper.class);
     public static class TestCaseMaker extends AnnotationGrammarBindingResolver {
         public TestCaseMaker() {
             super(TestCaseMakerHelper.class);

+            //add(MetaGrammarBindings.class, "grammar.");
+            add(MetaGrammarBindings.class, "");

         }
         }

-        public static class TestCaseMakerHelper extends MetaGrammarBindings {
+        public static class TestCaseMakerHelper {

             public static @bind.as("grammaro") @bind.raw Object grammaro(Iterable<Tree> t) {
                 return MetaGrammar.make(t.iterator().next(), "s", new TaggingGrammarBindingResolver());
             }
             public static @bind.as("grammaro") @bind.raw Object grammaro(Iterable<Tree> t) {
                 return MetaGrammar.make(t.iterator().next(), "s", new TaggingGrammarBindingResolver());
             }