X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2Fmisc%2FDemo.java;h=140af81626dff3dfa146ea00f801b93d4beb8d59;hb=643d10e52f2a42b603785a7e50f7f8aef272dfb0;hp=dbe62666eea7a2def2f2664eb76da1edcfc68bf1;hpb=80a840adb5df31ba5edd20ecac23086ad09a5ca1;p=sbp.git

diff --git a/src/edu/berkeley/sbp/misc/Demo.java b/src/edu/berkeley/sbp/misc/Demo.java
index dbe6266..140af81 100644
--- a/src/edu/berkeley/sbp/misc/Demo.java
+++ b/src/edu/berkeley/sbp/misc/Demo.java
@@ -184,6 +184,10 @@ public class Demo {
         public abstract tag getTag();
         public abstract nonterminal getNonTerminal();
         public abstract int[] buildSequence(Production p);
+
+        private Reflection.Bindable _bindable;
+        public Target(Reflection.Bindable b) { this._bindable = b; }
+
         public boolean isCompatible(Production p) {
             tag t = getTag();
             if (t != null &&
@@ -223,10 +227,10 @@ public class Demo {
         public Sequence makeSequence(Production p) {
             return Sequence.rewritingSequence(new TargetReducer(p, buildSequence(p), "reducer-"+this), p.elements, p.labels, p.drops);
         }
-        public abstract Object plant(Object[] fields, int[] map);
+        public abstract Object plant(Object[] fields);
         public boolean isRaw() { return false; }
-        public Object invokeRaw(Iterable<Tree> t) { return null; }
-        public class TargetReducer implements Functor<Iterable<Tree>,Object> {
+        public Object invokeRaw(Iterable<Tree<Object>> t) { return null; }
+        public class TargetReducer implements Tree.TreeFunctor<Object,Object> {
             private Production p;
             private int[] map;
             private String name;
@@ -236,12 +240,12 @@ public class Demo {
                 this.name = name;
             }
             public String toString() { return name; }
-            public Object invoke(Iterable<Tree> t) {
+            public Object invoke(Iterable<Tree<Object>> t) {
                 if (isRaw()) return invokeRaw(t);
                 ArrayList ret = new ArrayList();
                 for(Tree tc : t) {
                     if (tc.head() != null && tc.head() instanceof Functor)
-                        ret.add(((Functor<Iterable<Tree>,Object>)tc.head()).invoke(tc.children()));
+                        ret.add(((Tree.TreeFunctor<Object,Object>)tc.head()).invoke(tc.children()));
                     else if (tc.numChildren() == 0)
                         ret.add(tc.head());
                     else {
@@ -250,14 +254,19 @@ public class Demo {
                     }
                 }
                 System.err.println("input tree: " + t);
-                return plant(ret.toArray(new Object[0]), map);
+                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 plant(o2);
             }
         }
     }
 
     public static class TargetClass extends Target {
         public final Class _class;
-        public TargetClass(Class _class) { this._class = _class; }
+        public TargetClass(Class _class) { super(Reflection.Bindable.create(_class)); this._class = _class; }
         public String getName() { return _class.getSimpleName(); }
         public tag getTag() { return (tag)_class.getAnnotation(tag.class); }
         public nonterminal getNonTerminal() { return (nonterminal)_class.getAnnotation(nonterminal.class); }
@@ -277,41 +286,15 @@ public class Demo {
                     return new TargetConstructor(c).buildSequence(p);
             return null;
         }
-        public Object plant(Object[] fields, int[] map) {
-            try {
-                Object ret = _class.newInstance();
-                Field[] f = _class.getFields();
-                int j = 0;
-                for(int i=0; i<f.length; i++)
-                    if (map[i] != -1) {
-                        Object tgt = Reflection.lub(fields[map[i]]);
-                        if (f[i].getType() == String.class) tgt = stringify(tgt);
-                        // FUGLY
-                        tgt = coerce(tgt, f[i].getType());
-                        System.err.println("setting a " + f[i].getType().getName() + " to " + Reflection.show(tgt));
-                        f[i].set(ret, tgt);
-                    }
-                return ret;
-            } catch (Exception e) {
-                e.printStackTrace();
-                throw new RuntimeException(e);
-            }
+        public Object plant(Object[] fields) {
+            return Reflection.impose(_class, fields);
         }
-    }
-
-    public static String stringify(Object o) {
-        if (o==null) return "";
-        if (!(o instanceof Object[])) return o.toString();
-        Object[] arr = (Object[])o;
-        StringBuffer ret = new StringBuffer();
-        for(int i=0; i<arr.length; i++)
-            ret.append(arr[i]);
-        return ret.toString();
+        
     }
 
     public static class TargetConstructor extends Target {
         public final Constructor _ctor;
-        public TargetConstructor(Constructor _ctor) { this._ctor = _ctor; }
+        public TargetConstructor(Constructor _ctor) { super(Reflection.Bindable.create(_ctor)); this._ctor = _ctor; }
         public String getName() { return _ctor.getName(); }
         public tag getTag() { return (tag)_ctor.getAnnotation(tag.class); }
         public nonterminal getNonTerminal() { return (nonterminal)_ctor.getAnnotation(nonterminal.class); }
@@ -335,29 +318,13 @@ public class Demo {
                         argtags[i+ofs] = (arg)a;
             return buildSequence(p, names, argtags);
         }
-        public Object plant(Object[] fields, int[] map) {
-            try {
-                Class[] argTypes = _ctor.getParameterTypes();
-                Object[] args = new Object[argTypes.length];
-                int j = 0;
-                for(int i=0; i<args.length; i++)
-                    if (map[i] != -1) {
-                        Object tgt = Reflection.lub(fields[map[i]]);
-                        if (argTypes[i] == String.class) tgt = stringify(tgt);
-                        // FUGLY
-                        tgt = coerce(tgt, argTypes[i]);
-                        System.err.println("setting a " + argTypes[i].getName() + " to " + Reflection.show(tgt));
-                        args[i] = tgt;
-                    }
-                return _ctor.newInstance(args);
-            } catch (Exception e) {
-                throw new RuntimeException(e);
-            }
+        public Object plant(Object[] fields) {
+            return Reflection.impose(_ctor, fields);
         }
     }
     public static class TargetMethod extends Target {
         public final Method _method;
-        public TargetMethod(Method _method) { this._method = _method; }
+        public TargetMethod(Method _method) { super(Reflection.Bindable.create(_method)); this._method = _method; }
         public String getName() { return _method.getName(); }
         public String toString() { return _method.getName(); }
         public tag getTag() { return (tag)_method.getAnnotation(tag.class); }
@@ -374,78 +341,13 @@ public class Demo {
             return ret;
         }
         public boolean isRaw() { return _method.isAnnotationPresent(raw.class); }
-        public Object invokeRaw(Iterable<Tree> t) {
-            try {
-                return _method.invoke(null, new Object[] { t });
-            } catch (Exception e) {
-                throw new RuntimeException(e);
-            }
-        }
-        public Object plant(Object[] fields, int[] map) {
-            try {
-                Class[] argTypes = _method.getParameterTypes();
-                Object[] args = new Object[argTypes.length];
-                int j = 0;
-                for(int i=0; i<args.length; i++)
-                    if (map[i] != -1) {
-                        Object tgt = Reflection.lub(fields[map[i]]);
-                        if (argTypes[i] == String.class) tgt = stringify(tgt);
-                        // FUGLY
-                        tgt = coerce(tgt, argTypes[i]);
-                        System.err.println("setting a " + argTypes[i].getName() + " to " + Reflection.show(tgt));
-                        args[i] = tgt;
-                    }
-                System.err.println("invoking " + _method + " with " + Reflection.show(args));
-                return _method.invoke(null, args);
-            } catch (Exception e) {
-                throw new RuntimeException(e);
-            }
-        }
-    }
-
-    public static Object coerce(Object o, Class c) {
-        if (o==null) return null;
-        if (c.isInstance(o)) return o;
-        if (c == char.class) {
-            return o.toString().charAt(0);
-        }
-
-        if (o.getClass().isArray() &&
-            o.getClass().getComponentType().isArray() &&
-            o.getClass().getComponentType().getComponentType() == String.class &&
-            c.isArray() &&
-            c.getComponentType() == String.class) {
-            String[] ret = new String[((Object[])o).length];
-            for(int i=0; i<ret.length; i++) {
-                StringBuffer sb = new StringBuffer();
-                for(Object ob : (Object[])(((Object[])o)[i]))
-                    sb.append(ob);
-                ret[i] = sb.toString();
-            }
-            return ret;
+        public Object invokeRaw(Iterable<Tree<Object>> t) {
+            return Reflection.impose(_method, new Object[] { t });
         }
-
-        if (c.isArray() && (c.getComponentType().isInstance(o))) {
-            Object[] ret = (Object[])Array.newInstance(c.getComponentType(), 1);
-            ret[0] = o;
-            return ret;
-        }
-
-        if (o.getClass().isArray() && c.isArray()) {
-            boolean ok = true;
-            for(int i=0; i<((Object[])o).length; i++) {
-                Object ob = (((Object[])o)[i]);
-                if (ob != null) {
-                    System.err.println("no hit with " + c.getComponentType().getName() + " on " + Reflection.show(((Object[])o)[i]));
-                    ok = false;
-                }
-            }
-            if (ok) {
-                System.err.println("hit with " + c.getComponentType().getName());
-                return Array.newInstance(c.getComponentType(), ((Object[])o).length);
-            }
+        public Object plant(Object[] fields) {
+            return Reflection.impose(_method, fields);
         }
-        return o;
+        
     }
 
     public static Union cached = null;
@@ -465,7 +367,7 @@ public class Demo {
     }
     public static Union make(Tree t, String s) { return make(t, s, new ReflectiveMeta()); }
     public static Union make(Tree t, String s, ReflectiveMeta rm) {
-        Functor<Iterable<Tree>,Object> red = (Functor<Iterable<Tree>,Object>)t.head();
+        Tree.TreeFunctor<Object,Object> red = (Tree.TreeFunctor<Object,Object>)t.head();
         MG.Grammar g = (MG.Grammar)red.invoke(t.children());
         Context cx = new Context(g,rm);
         Union u = null;
@@ -765,7 +667,7 @@ public class Demo {
         }
         public Context(Tree t, ReflectiveMeta rm) {
             this.rm = rm;
-            Functor<Iterable<Tree>,Object> red = (Functor<Iterable<Tree>,Object>)t.head();
+            Tree.TreeFunctor<Object,Object> red = (Tree.TreeFunctor<Object,Object>)t.head();
             this.grammar = (MG.Grammar)red.invoke(t.children());
         }
         public Union peek(String name) { return map.get(name); }