X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2Fmisc%2FReflectiveWalker.java;h=ad057a75264b3d32ab3f305856140bbd1b5e920d;hb=173e1696d10a91db6f5a919dbb2b2ed2c6e2a227;hp=c99a46364bcab4a542e2def25bff9d8270872e7d;hpb=0db242407cbae04f1a55086bf2bd31f5ae1bb7a8;p=sbp.git

diff --git a/src/edu/berkeley/sbp/misc/ReflectiveWalker.java b/src/edu/berkeley/sbp/misc/ReflectiveWalker.java
index c99a463..ad057a7 100644
--- a/src/edu/berkeley/sbp/misc/ReflectiveWalker.java
+++ b/src/edu/berkeley/sbp/misc/ReflectiveWalker.java
@@ -10,7 +10,7 @@ public class ReflectiveWalker extends StringWalker {
     public ReflectiveWalker()              { this.target = this; }
     public ReflectiveWalker(Object target) { this.target = target; }
     private final Object target;
-    private String normalize(String s) {
+    public static String mangle(String s) {
         StringBuffer ret = new StringBuffer();
         for(int i=0; i<s.length(); i++) {
             char c = s.charAt(i);
@@ -57,7 +57,7 @@ public class ReflectiveWalker extends StringWalker {
     /*
     public Object walk(Tree<String> tree) {
         if (tree.head()!=null) {
-            Member m = member("$"+normalize(tree.head()), 0, false);
+            Member m = member("$"+mangle(tree.head()), 0, false);
             if (m!=null) {
                 if ((m instanceof Method) && ((Method)m).getReturnType()==Void.TYPE) {
                     Reflection.fuzzyInvoke(target, m, new Object[0]);
@@ -68,15 +68,17 @@ public class ReflectiveWalker extends StringWalker {
     }
     */
     public void walk(String tag) {
-        Member m = member(normalize(tag), 0, false);
+        if (tag==null) return;
+        Member m = member(mangle(tag), 0, false);
         if (m!=null) Reflection.fuzzyInvoke(target, m);
     }
+    protected Object defaultWalk(String tag, Object[] argo) { return super.walk(tag, argo); }
     public Object walk(String tag, Object[] argo) {
         if (argo.length==0) return super.walk(tag, argo);
         if (argo==null) return tag;
         if (tag==null || "".equals(tag)) return argo;
-        Member m = member(normalize(tag), argo.length, argo.length>0);
-        if (m==null) return super.walk(tag, argo);
+        Member m = tag==null ? null : member(mangle(tag), argo.length, false);
+        if (m==null) return defaultWalk(tag, argo);
         //System.out.println("preparing to invoke method " + (m==null ? "null" : (m.toString())) + " for sequence " + (owner()+"."+tag));
         if (m != null) return Reflection.fuzzyInvoke(target, m, argo);
         if (argo.length==0) return null;