X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2Fmeta%2FMetaGrammar.java;h=2340de21b89829fe7c43fe02d89ee74d54958361;hb=a7ed3694a03bf9fe30e3274775c0646554e99bd4;hp=77635d017e3534852d7f237f1f64122c9455edbc;hpb=41b74cd8469abb0bdff811f26594a7ef87cb26a6;p=sbp.git

diff --git a/src/edu/berkeley/sbp/meta/MetaGrammar.java b/src/edu/berkeley/sbp/meta/MetaGrammar.java
index 77635d0..2340de2 100644
--- a/src/edu/berkeley/sbp/meta/MetaGrammar.java
+++ b/src/edu/berkeley/sbp/meta/MetaGrammar.java
@@ -52,52 +52,22 @@ public class MetaGrammar {
         p.flush();
         os.close();
     }
-
-
    
-    public static class Production {
-        public String tag;
-        public String nonTerminal;
-        public Object[] labels;
-        public boolean[] drops;
-        public Element[] elements;
-        public int count = 0;
-        public Production(String tag, String nonTerminal, Element[] elements, Object[] labels, boolean[] drops) {
-            this.tag = tag;
-            this.elements = elements;
-            this.nonTerminal = nonTerminal;
-            this.labels = labels;
-            this.drops = drops;
-            for(int i=0; i<drops.length; i++)
-                if (!drops[i])
-                    count++;
-        }
-    }
+    public static class TreeBindable {
 
-    public static class Target {
-        public int[] buildSequence(Production p) {
-            Annotation[][] annotations = _bindable.getArgAnnotations();
-            String[]       names       = _bindable.getArgNames();
-            String name = _bindable.getSimpleName();
-            int len = annotations.length;
-            int ofs = 0;
-            bind.arg[] argtags  = new bind.arg[len];
-            for(int i=0; i<names.length; i++)
-                for(Annotation a : annotations[i+ofs])
-                    if (a instanceof bind.arg)
-                        argtags[i+ofs] = (bind.arg)a;
-            return Target.this.buildSequence(p, names, argtags);
-        }
         private Bindable _bindable;
+        public TreeBindable(Object o) { this(Bindable.create(o)); }
+        public TreeBindable(Bindable b) { this._bindable = b; }
 
-        public Target(Object o) { this(Bindable.create(o)); }
-        public Target(Bindable b) { this._bindable = b; }
+        private int[] buildSequence(Production p) {
+            return p.buildSequence(_bindable);
+        }
 
-        public String getName() { return _bindable.getSimpleName(); }
-        public bind getBind() { return (bind)_bindable.getAnnotation(bind.class); }
+        public String  getName()   { return _bindable.getSimpleName(); }
+        public bind    getBind()   { return (bind)_bindable.getAnnotation(bind.class); }
         public bind.as getBindAs() { return (bind.as)_bindable.getAnnotation(bind.as.class); }
-        public String toString() { return _bindable.getSimpleName(); }
-        public boolean isRaw() { return _bindable.isAnnotationPresent(bind.raw.class); }
+        public String  toString()  { return _bindable.getSimpleName(); }
+        public boolean isRaw()     { return _bindable.isAnnotationPresent(bind.raw.class); }
 
         public boolean isCompatible(Production p) {
             bind.as t = getBindAs();
@@ -114,64 +84,73 @@ public class MetaGrammar {
                 return buildSequence(p)!=null;
 
             if (t != null &&
-                (t.value().equals(p.nonTerminal)))
+                (t.value().equals(p.tag)))
                 return buildSequence(p)!=null;
             if (t != null &&
-                ((t.value().equals("") && getName().equals(p.nonTerminal))))
+                ((t.value().equals("") && getName().equals(p.tag))))
                 return buildSequence(p)!=null;
-            if (b != null && getName().equals(p.nonTerminal))
+            if (b != null && getName().equals(p.tag))
                 return buildSequence(p)!=null;
 
             return false;
         }
 
-        public int[] buildSequence(Production p, String[] names, bind.arg[] argtags) {
-            int argTagged = 0;
-            for(int i=0; i<argtags.length; i++)
-                if (argtags[i] != null)
-                    argTagged++;
-
-            // FIXME: can be smarter here
-            if (argTagged==p.count) {
-                int[] ret = new int[argtags.length];
-                int j = 0;
-                for(int i=0; i<argtags.length; i++) {
-                    if (argtags[i]==null) continue;
-                    if (argtags[i].value().equals(""))
-                        ret[i] = j++;
-                    else {
-                        ret[i] = -1;
-                        for(int k=0; k<names.length; k++)
-                            if (argtags[i].value().equals(names[k])){
-                                ret[i] = k;
-                                break;
+        public Sequence makeSequence(final Production p) {
+
+            if (_bindable.getArgTypes().length > 0 &&
+                _bindable.getArgTypes()[0] == Input.Region.class) {
+                Functor<Input.Region,Object> func = new Functor<Input.Region,Object>() {
+                    public Object invoke(final Input.Region region) {
+                        return 
+                        new TreeBindableReducer(buildSequence(p),
+                                                _bindable,
+                                                isRaw()) {
+                            public Object invoke(Iterable<Tree<Object>> t) {
+                                if (_israw) return _bindable.impose(new Object[] { t });
+                                ArrayList ret = new ArrayList();
+                                ret.add(region);
+                                for(Tree tc : t) {
+                                    if (tc.head() != null && tc.head() instanceof Functor)
+                                        ret.add(((Tree.TreeFunctor<Object,Object>)tc.head()).invoke(tc.children()));
+                                    else if (tc.numChildren() == 0)
+                                        ret.add(tc.head());
+                                    else {
+                                        System.err.println("FIXME: don't know what to do about " + tc);
+                                        ret.add(null);
+                                    }
+                                }
+                                Object[] o = (Object[])ret.toArray(new Object[0]);
+                                int max = 0;
+                                for(int i=0; i<map.length; i++) max = Math.max(map[i], max);
+                                Object[] o2 = new Object[max+2];
+                                for(int i=0; i<o.length; i++) o2[map[i]+1] = o[i];
+                                o2[0] = region;
+                                return _bindable.impose(o2);
                             }
-                        if (ret[i]==-1) return null;
+                        };
                     }
-                }
-                return ret;
-            } else if (names.length==p.count) {
-                int[] ret = new int[p.count];
-                for(int i=0; i<p.count; i++) ret[i] = i;
-                return ret;
-            } else {
-                return null;
+                };
+                return Sequence.regionRewritingSequence(func,
+                                                        p.elements,
+                                                        p.drops);
             }
-        }
-        public Sequence makeSequence(Production p) {
-            return Sequence.rewritingSequence(new TargetReducer(buildSequence(p), _bindable, isRaw()),
-                                              p.elements, p.labels, p.drops);
+
+            return Sequence.rewritingSequence(new TreeBindableReducer(buildSequence(p),
+                                                                      _bindable,
+                                                                      isRaw()),
+                                              p.elements,
+                                              p.drops);
         }
 
     }
 
-    public static class TargetReducer implements Tree.TreeFunctor<Object,Object>, ToJava {
-        private int[] map;
-        private Bindable _bindable;
-        private boolean _israw;
+    public static class TreeBindableReducer implements Tree.TreeFunctor<Object,Object>, ToJava {
+         int[] map;
+         Bindable _bindable;
+         boolean _israw;
 
         public void toJava(StringBuffer sb) {
-            sb.append("new MetaGrammar.TargetReducer(new int[] {");
+            sb.append("new MetaGrammar.TreeBindableReducer(new int[] {");
             for(int i=0; i<map.length; i++) sb.append((i+"")+(i<map.length-1 ? "," : ""));
             sb.append("}, ");
             _bindable.toJava(sb);
@@ -180,7 +159,7 @@ public class MetaGrammar {
             sb.append(")");
         }
         
-        public TargetReducer(int[] map, Bindable b, boolean raw) {
+        public TreeBindableReducer(int[] map, Bindable b, boolean raw) {
             this.map = map;
             this._bindable = b;
             this._israw = raw;
@@ -200,11 +179,7 @@ public class MetaGrammar {
                 }
             }
             Object[] o = (Object[])ret.toArray(new Object[0]);
-            int max = 0;
-            for(int i=0; i<map.length; i++) max = Math.max(map[i], max);
-            Object[] o2 = new Object[max+1];
-            for(int i=0; i<o.length; i++) o2[map[i]] = o[i];
-            return _bindable.impose(o2);
+            return _bindable.createBinding(map).invoke(o);
         }
     }