X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2Fmisc%2FReflectiveWalker.java;h=60f8e9bef0261d39596784912a26f2a3f32d4bc8;hp=c838a5e9da76e333f2b84d152d49f85ca50c16d5;hb=3ee451bce342d4bb61ad6235ba57bdf817bfdd1a;hpb=197c866f6a1c4adbcb4c299258af1ecc3178aa13

diff --git a/src/edu/berkeley/sbp/misc/ReflectiveWalker.java b/src/edu/berkeley/sbp/misc/ReflectiveWalker.java
index c838a5e..60f8e9b 100644
--- a/src/edu/berkeley/sbp/misc/ReflectiveWalker.java
+++ b/src/edu/berkeley/sbp/misc/ReflectiveWalker.java
@@ -1,3 +1,5 @@
+// Copyright 2006 all rights reserved; see LICENSE file for BSD-style license
+
 package edu.berkeley.sbp.misc;
 import edu.berkeley.sbp.*;
 import edu.berkeley.sbp.util.*;
@@ -10,7 +12,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 +59,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]);
@@ -69,15 +71,16 @@ public class ReflectiveWalker extends StringWalker {
     */
     public void walk(String tag) {
         if (tag==null) return;
-        Member m = member(normalize(tag), 0, false);
+        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 = tag==null ? null : 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;