From: adam <adam@megacz.com>
Date: Wed, 5 Jul 2006 02:44:00 +0000 (-0400)
Subject: checkpoint
X-Git-Tag: tag_for_25-Mar~216
X-Git-Url: http://git.megacz.com/?p=sbp.git;a=commitdiff_plain;h=0f0ed458838eb080e12ad9a52a46a4060d40df43

checkpoint

darcs-hash:20060705024400-5007d-5e283d25449c01dc75e7846dabadd203670aabef.gz
---

diff --git a/src/edu/berkeley/sbp/misc/Demo.java b/src/edu/berkeley/sbp/misc/Demo.java
index d29a8f9..212e60e 100644
--- a/src/edu/berkeley/sbp/misc/Demo.java
+++ b/src/edu/berkeley/sbp/misc/Demo.java
@@ -273,6 +273,19 @@ public class Demo {
                 for(int i=0; i<o.length; i++) o2[map[i]] = o[i];
                 return plant(o2);
             }
+            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);
+            }
         }
     }
 
@@ -310,8 +323,8 @@ public class Demo {
                 ofs++;
             }
             */
-            String[] names   = new String[len];
-            bind.arg[]    argtags = new bind.arg[len];
+            String[] names      = new String[len];
+            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)
diff --git a/src/edu/berkeley/sbp/util/Reflection.java b/src/edu/berkeley/sbp/util/Reflection.java
index 28676bf..3a129d4 100644
--- a/src/edu/berkeley/sbp/util/Reflection.java
+++ b/src/edu/berkeley/sbp/util/Reflection.java
@@ -329,6 +329,10 @@ public final class Reflection {
         public abstract <A extends Annotation> A getAnnotation(Class<A> c);
         public abstract Object impose(Object[] fields);
         public boolean isAnnotationPresent(Class<? extends Annotation> c) { return getAnnotation(c) != null; }
+
+        public abstract Annotation[][] getArgAnnotations();
+        public abstract String[]       getArgNames();
+
         public static Bindable create(Object o) {
             if (o instanceof Class) return new BindableClass((Class)o);
             if (o instanceof Method) return new BindableMethod((Method)o);
@@ -344,6 +348,8 @@ public final class Reflection {
         public String getSimpleName() { return _method.getName(); }
         public <A extends Annotation> A getAnnotation(Class<A> c) { return _method.getAnnotation(c); }
         public Object impose(Object[] fields) { return Reflection.impose(_method, fields); }
+        public Annotation[][] getArgAnnotations() { return _method.getParameterAnnotations(); }
+        public String[]       getArgNames() { return new String[_method.getParameterTypes().length]; }
     }
     private static class BindableConstructor extends Bindable {
         private final Constructor _constructor;
@@ -352,6 +358,8 @@ public final class Reflection {
         public String getSimpleName() { return _constructor.getName(); }
         public <A extends Annotation> A getAnnotation(Class<A> c) { return _constructor.getAnnotation(c); }
         public Object impose(Object[] fields) { return Reflection.impose(_constructor, fields); }
+        public Annotation[][] getArgAnnotations() { return _constructor.getParameterAnnotations(); }
+        public String[]       getArgNames() { return new String[_constructor.getParameterTypes().length]; }
     }
     private static class BindableClass extends Bindable {
         private final Class _class;
@@ -360,6 +368,20 @@ public final class Reflection {
         public String getSimpleName() { return _class.getSimpleName(); }
         public <A extends Annotation> A getAnnotation(Class<A> c) { return (A)_class.getAnnotation(c); }
         public Object impose(Object[] fields) { return Reflection.impose(_class, fields); }
+        public Annotation[][] getArgAnnotations() {
+            Field[] fields = _class.getFields();
+            Annotation[][] ret = new Annotation[fields.length][];
+            for(int i=0; i<fields.length; i++)
+                ret[i] = fields[i].getAnnotations();
+            return ret;
+        }
+        public String[]       getArgNames() {
+            Field[] fields = _class.getFields();
+            String[] ret = new String[fields.length];
+            for(int i=0; i<fields.length; i++)
+                ret[i] = fields[i].getName();
+            return ret;
+        }
     }
 
 }