[armedbear-cvs] r13469 - trunk/abcl/src/org/armedbear/lisp

[ehuelsmann at common-lisp.net]

Author: ehuelsmann
Date: Fri Aug 12 12:12:24 2011
New Revision: 13469

Log:
Remove duplicate information and the need to keep it up to date.

Modified:
   trunk/abcl/src/org/armedbear/lisp/compiler-pass2.lisp
   trunk/abcl/src/org/armedbear/lisp/jvm.lisp

Modified: trunk/abcl/src/org/armedbear/lisp/compiler-pass2.lisp
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/compiler-pass2.lisp	Fri Aug 12 11:53:46 2011	(r13468)
+++ trunk/abcl/src/org/armedbear/lisp/compiler-pass2.lisp	Fri Aug 12 12:12:24 2011	(r13469)
@@ -1347,7 +1347,8 @@
    local-function *declared-functions* ht g
    (setf g (symbol-name (gensym "LFUN")))
    (let ((class-name (abcl-class-file-class-name
-                      (local-function-class-file local-function))))
+                      (compiland-class-file
+                       (local-function-compiland local-function)))))
      (with-code-to-method
          (*class-file* (abcl-class-file-constructor *class-file*))
        ;; fixme *declare-inline*
@@ -4054,14 +4055,10 @@
 (defun p2-flet-process-compiland (local-function)
   (let* ((compiland (local-function-compiland local-function)))
     (cond (*file-compilation*
-           (compile-and-write-to-stream compiland)
-           (setf (local-function-class-file local-function)
-                 (compiland-class-file compiland)))
+           (compile-and-write-to-stream compiland))
           (t
            (with-open-stream (stream (sys::%make-byte-array-output-stream))
              (compile-and-write-to-stream compiland stream)
-             (setf (local-function-class-file local-function)
-                   (compiland-class-file compiland))
              (let ((bytes (sys::%get-output-stream-bytes stream)))
                (sys::put-memory-function *memory-class-loader*
                                          (class-name-internal
@@ -4088,16 +4085,12 @@
   (let* ((compiland (local-function-compiland local-function)))
     (cond (*file-compilation*
            (compile-and-write-to-stream compiland)
-           (setf (local-function-class-file local-function)
-                 (compiland-class-file compiland))
            (let ((g (declare-local-function local-function)))
              (emit-make-compiled-closure-for-labels
               local-function compiland g)))
           (t
            (with-open-stream (stream (sys::%make-byte-array-output-stream))
              (compile-and-write-to-stream compiland stream)
-             (setf (local-function-class-file local-function)
-                   (compiland-class-file compiland))
              (let* ((bytes (sys::%get-output-stream-bytes stream))
                     (g (declare-local-function local-function)))
                (sys::put-memory-function *memory-class-loader*
@@ -4153,8 +4146,7 @@
          (compile-and-write-to-stream compiland)
          (emit-getstatic *this-class*
                          (declare-local-function
-                          (make-local-function
-                           :class-file (compiland-class-file compiland)))
+                          (make-local-function :compiland compiland))
                          +lisp-object+))
         (t
          (with-open-stream (stream (sys::%make-byte-array-output-stream))

Modified: trunk/abcl/src/org/armedbear/lisp/jvm.lisp
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/jvm.lisp	Fri Aug 12 11:53:46 2011	(r13468)
+++ trunk/abcl/src/org/armedbear/lisp/jvm.lisp	Fri Aug 12 12:12:24 2011	(r13469)
@@ -380,7 +380,6 @@
   definition
   compiland
   inline-expansion
-  class-file  ;; the class file structure for this function
   variable    ;; the variable which contains the loaded compiled function
               ;; or compiled closure
   environment ;; the environment in which the function is stored in