Changeset 12866 for branches/generic-class-file/abcl/src/org/armedbear/lisp/jvm-class-file.lisp

Timestamp:

08/06/10 21:47:06 (13 years ago)

Author:

astalla

Message:

WIHT-CODE-TO-METHOD fixes and tests for nesting.

File:

• branches/generic-class-file/abcl/src/org/armedbear/lisp/jvm-class-file.lisp (modified) (4 diffs)

branches/generic-class-file/abcl/src/org/armedbear/lisp/jvm-class-file.lisp

@@ -882 +882 @@
   labels ;; an alist
 
-  current-local) ;; used for handling nested WITH-CODE-TO-METHOD blocks
+  (current-local 0)) ;; used for handling nested WITH-CODE-TO-METHOD blocks
 
 
@@ -1047 +1047 @@
         *register* (code-current-local code)))
 
-(defmacro with-code-to-method ((class-file method &key safe-nesting) &body body)
+(defmacro with-code-to-method ((class-file method &key (safe-nesting t))
+             &body body)
   (let ((m (gensym))
         (c (gensym)))
@@ -1055 +1056 @@
                (save-code-specials *current-code-attribute*))))
        (let* ((,m ,method)
-              (,c (method-ensure-code method))
+              (,c (method-ensure-code ,method))
               (*pool* (class-file-constants ,class-file))
               (*code* (code-code ,c))
@@ -1063 +1064 @@
          ,@body
          (setf (code-code ,c) *code*
+         (code-current-local ,c) *register*
 ;;               (code-exception-handlers ,c) *handlers*
                (code-max-locals ,c) *registers-allocated*))