Changeset 13485

Timestamp:

08/13/11 09:13:53 (11 years ago)

Author:

ehuelsmann

Message:

Remove two structure slots which are read only once, in favor of
passing in the right values to the reading function.

Location:

trunk/abcl/src/org/armedbear/lisp

Files:

• compiler-pass2.lisp (modified) (7 diffs)
• jvm.lisp (modified) (3 diffs)

trunk/abcl/src/org/armedbear/lisp/compiler-pass2.lisp

@@ -938 +938 @@
   (emit-constructor-lambda-list object))
 
-(defun make-constructor (class)
+(defun make-constructor (class lambda-name args)
   (let* ((*compiler-debug* nil)
          (method (make-jvm-method :constructor :void nil
@@ -944 +944 @@
          ;; We don't normally need to see debugging output for constructors.
          (super (class-file-superclass class))
-         (lambda-name (abcl-class-file-lambda-name class))
-         (args (abcl-class-file-lambda-list class))
          req-params-register
          opt-params-register
@@ -4037 +4035 @@
   (let* ((pathname (funcall *pathnames-generator*))
          (class-file (make-abcl-class-file
-                      :pathname pathname
-                      :lambda-list
-                      (cadr (compiland-lambda-expression compiland)))))
+                      :pathname pathname)))
     (setf (compiland-class-file compiland) class-file)
     (with-open-stream (f (or stream
@@ -7125 +7121 @@
     (class-add-method class-file method)
 
-    (setf (abcl-class-file-lambda-list class-file) args)
     (setf (abcl-class-file-superclass class-file)
           (if (or *hairy-arglist-p*
@@ -7132 +7127 @@
               +lisp-compiled-primitive+))
 
-    (let ((constructor (make-constructor class-file)))
+    (let ((constructor
+           (make-constructor class-file (compiland-name compiland) args)))
       (setf (abcl-class-file-constructor class-file) constructor)
       (class-add-method class-file constructor))
@@ -7387 +7383 @@
   (aver (eq (car form) 'LAMBDA))
   (catch 'compile-defun-abort
-    (let* ((class-file (make-abcl-class-file :pathname filespec
-                                             :lambda-name name
-                                             :lambda-list (cadr form)))
+    (let* ((class-file (make-abcl-class-file :pathname filespec))
            (*compiler-error-bailout*
             `(lambda ()
@@ -7396 +7390 @@
                                 :lambda-expression (make-compiler-error-form ',form)
                                 :class-file
-                                (make-abcl-class-file :pathname ,filespec
-                                                      :lambda-name ',name
-                                                      :lambda-list (cadr ',form)))
+                                (make-abcl-class-file :pathname ,filespec))
                 ,stream)))
            (*compile-file-environment* environment))

trunk/abcl/src/org/armedbear/lisp/jvm.lisp

@@ -131 +131 @@
   pathname ; pathname of output file
   class-name
-  lambda-name
-  lambda-list ; as advertised
   static-initializer
   constructor
@@ -161 +159 @@
                                                       "java.util.UUID"))))))
 
-(defun make-abcl-class-file (&key pathname lambda-name lambda-list)
+(defun make-abcl-class-file (&key pathname)
   "Creates a `class-file' structure. If `pathname' is non-NIL, it's
 used to derive a class name. If it is NIL, a random one created
@@ -171 +169 @@
                                             :class class-name ; to be finalized
                                             :class-name class-name
-                                            :lambda-name lambda-name
-                                            :lambda-list lambda-list
                                             :access-flags '(:public :final))))
     (when *file-compilation*