From: adam <adam@megacz.com>
Date: Wed, 5 Jul 2006 02:47:59 +0000 (-0400)
Subject: checkpoint
X-Git-Tag: tag_for_25-Mar~213
X-Git-Url: http://git.megacz.com/?p=sbp.git;a=commitdiff_plain;h=d36770411e8f4122d946a0220c7f5b007c0df177;hp=32d016fe9745635fd9e260e98daf64fb2df5acdb

checkpoint

darcs-hash:20060705024759-5007d-88bcb68cedac146efaa0594263c327c00b529b9d.gz
---

diff --git a/src/edu/berkeley/sbp/misc/Demo.java b/src/edu/berkeley/sbp/misc/Demo.java
index 3e6436a..08a8a89 100644
--- a/src/edu/berkeley/sbp/misc/Demo.java
+++ b/src/edu/berkeley/sbp/misc/Demo.java
@@ -180,7 +180,19 @@ public class Demo {
     }
 
     public static abstract class Target {
-        public abstract int[] buildSequence(Production p);
+            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 Reflection.Bindable _bindable;
         public Target(Reflection.Bindable b) { this._bindable = b; }
 
@@ -265,79 +277,21 @@ 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);
-            }
         }
     }
 
     public static class TargetClass extends Target {
         public final Class _class;
         public TargetClass(Class _class) { super(Reflection.Bindable.create(_class)); this._class = _class; }
-        public int[] buildSequence(Production p) {
-            Field[]  f       = _class.getDeclaredFields();
-            String[] names   = new String[f.length];
-            bind.arg[]    argtags = new bind.arg[f.length];
-            for(int i=0; i<f.length; i++) {
-                names[i]   = f[i].getName();
-                argtags[i] = f[i].getAnnotation(bind.arg.class);
-            }
-            int[] ret = buildSequence(p, names, argtags);
-            if (ret!=null) return ret;
-            for(Constructor c : _class.getConstructors())
-                if (new TargetConstructor(c).buildSequence(p)!=null)
-                    return new TargetConstructor(c).buildSequence(p);
-            return null;
-        }
     }
 
     public static class TargetConstructor extends Target {
         public final Constructor _ctor;
         public TargetConstructor(Constructor _ctor) { super(Reflection.Bindable.create(_ctor)); this._ctor = _ctor; }
-        public int[] buildSequence(Production p) {
-            Annotation[][] annotations = _ctor.getParameterAnnotations();
-            int len = annotations.length;
-            int ofs = 0;
-            String name = _ctor.getDeclaringClass().getName();
-            /*
-            if (name.indexOf('$') > name.lastIndexOf('.')) {
-                len--;
-                ofs++;
-            }
-            */
-            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)
-                        argtags[i+ofs] = (bind.arg)a;
-            return buildSequence(p, names, argtags);
-        }
     }
     public static class TargetMethod extends Target {
         public final Method _method;
         public TargetMethod(Method _method) { super(Reflection.Bindable.create(_method)); this._method = _method; }
-        public int[] buildSequence(Production p) {
-            Annotation[][] annotations = _method.getParameterAnnotations();
-            String[] names   = new String[annotations.length];
-            bind.arg[]    argtags = new bind.arg[annotations.length];
-            for(int i=0; i<names.length; i++)
-                for(Annotation a : annotations[i])
-                    if (a instanceof bind.arg)
-                        argtags[i] = (bind.arg)a;
-            int[] ret = buildSequence(p, names, argtags);
-            return ret;
-        }
     }
 
     public static Union cached = null;