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

Timestamp:

08/09/10 11:31:52 (13 years ago)

Author:

ehuelsmann

Message:

Switch pass2 to the pool routines from jvm-class-file.lisp.

File:

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

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

@@ -138 +138 @@
 (defmacro with-class-file (class-file &body body)
   (let ((var (gensym)))
-    `(let* ((,var ,class-file)
-            (*pool*                 (abcl-class-file-pool ,var))
-            (*pool-count*           (abcl-class-file-pool-count ,var))
-            (*pool-entries*         (abcl-class-file-pool-entries ,var))
+    `(let* ((,var                   ,class-file)
+            (*class-file*           ,var)
+            (*pool*                 (abcl-class-file-constants ,var))
             (*fields*               (abcl-class-file-fields ,var))
             (*static-code*          (abcl-class-file-static-code ,var))
@@ -147 +146 @@
             (*declared-functions*   (abcl-class-file-functions ,var)))
        (progn ,@body)
-       (setf (abcl-class-file-pool ,var)         *pool*
-             (abcl-class-file-pool-count ,var)   *pool-count*
-             (abcl-class-file-pool-entries ,var) *pool-entries*
-             (abcl-class-file-fields ,var)       *fields*
+       (setf (abcl-class-file-fields ,var)       *fields*
              (abcl-class-file-static-code ,var)  *static-code*
              (abcl-class-file-objects ,var)      *externalized-objects*