made javassist.expr.MethodCall#replace correctly work

with super's method calls.


git-svn-id: http://anonsvn.jboss.org/repos/javassist/trunk@53 30ef5769-5b8d-40dd-aea6-55b5d6557bb3

1 files changed, 33 insertions, 0 deletions

diff --git a/src/main/javassist/compiler/Javac.java b/src/main/javassist/compiler/Javac.java
index e0bf3428..44c3ff11 100644
--- a/src/main/javassist/compiler/Javac.java
+++ b/src/main/javassist/compiler/Javac.java
@@ -384,6 +384,39 @@ public class Javac {
     }
 
     /**
+     * Prepares to use $proceed() representing a private/super's method.
+     * If the return type of $proceed() is void, null is pushed on the
+     * stack.  This method is for methods invoked by INVOKESPECIAL.
+     *
+     * @param target    an expression specifying the target object.
+     *                          if null, "this" is the target.
+     * @param classname	    the class name declaring the method.
+     * @param methodname    the method name.
+     * @param descriptor    the method descriptor.
+     */
+    public void recordSpecialProceed(String target, String classname,
+                                     String methodname, String descriptor)
+        throws CompileError
+    {
+        Parser p = new Parser(new Lex(target));
+        final ASTree texpr = p.parseExpression(stable);
+        final String cname = classname;
+        final String method = methodname;
+        final String desc = descriptor;
+
+        ProceedHandler h = new ProceedHandler() {
+                public void doit(JvstCodeGen gen, Bytecode b, ASTList args)
+                    throws CompileError
+                {
+                    gen.compileInvokeSpecial(texpr,
+                                             cname, method, desc, args);
+                }
+            };
+
+        gen.setProceedHandler(h, proceedName);
+    }
+
+    /**
      * Prepares to use $proceed().
      */
     public void recordProceed(ProceedHandler h) {