X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2Fmisc%2FReflectiveWalker.java;h=ad057a75264b3d32ab3f305856140bbd1b5e920d;hp=c22e81c87142d2265ad8a62a07a54084dc0aec10;hb=bad286576656a73e315f0aa7b08a1c1714eb8390;hpb=2724e3d1df836f6ce40bc4227f1509e777de2e48

diff --git a/src/edu/berkeley/sbp/misc/ReflectiveWalker.java b/src/edu/berkeley/sbp/misc/ReflectiveWalker.java
index c22e81c..ad057a7 100644
--- a/src/edu/berkeley/sbp/misc/ReflectiveWalker.java
+++ b/src/edu/berkeley/sbp/misc/ReflectiveWalker.java
@@ -5,11 +5,12 @@ import java.io.*;
 import java.util.*;
 import java.lang.reflect.*;
 
+/** use of this class is not recommended; it can handle only S-attributed grammars */
 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);
@@ -56,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]);
@@ -66,12 +67,18 @@ public class ReflectiveWalker extends StringWalker {
         return super.walk(tree);
     }
     */
+    public void walk(String tag) {
+        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;