Changeset 13485
- Timestamp:
- 08/13/11 09:13:53 (11 years ago)
- Location:
- trunk/abcl/src/org/armedbear/lisp
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/abcl/src/org/armedbear/lisp/compiler-pass2.lisp
r13484 r13485 938 938 (emit-constructor-lambda-list object)) 939 939 940 (defun make-constructor (class )940 (defun make-constructor (class lambda-name args) 941 941 (let* ((*compiler-debug* nil) 942 942 (method (make-jvm-method :constructor :void nil … … 944 944 ;; We don't normally need to see debugging output for constructors. 945 945 (super (class-file-superclass class)) 946 (lambda-name (abcl-class-file-lambda-name class))947 (args (abcl-class-file-lambda-list class))948 946 req-params-register 949 947 opt-params-register … … 4037 4035 (let* ((pathname (funcall *pathnames-generator*)) 4038 4036 (class-file (make-abcl-class-file 4039 :pathname pathname 4040 :lambda-list 4041 (cadr (compiland-lambda-expression compiland))))) 4037 :pathname pathname))) 4042 4038 (setf (compiland-class-file compiland) class-file) 4043 4039 (with-open-stream (f (or stream … … 7125 7121 (class-add-method class-file method) 7126 7122 7127 (setf (abcl-class-file-lambda-list class-file) args)7128 7123 (setf (abcl-class-file-superclass class-file) 7129 7124 (if (or *hairy-arglist-p* … … 7132 7127 +lisp-compiled-primitive+)) 7133 7128 7134 (let ((constructor (make-constructor class-file))) 7129 (let ((constructor 7130 (make-constructor class-file (compiland-name compiland) args))) 7135 7131 (setf (abcl-class-file-constructor class-file) constructor) 7136 7132 (class-add-method class-file constructor)) … … 7387 7383 (aver (eq (car form) 'LAMBDA)) 7388 7384 (catch 'compile-defun-abort 7389 (let* ((class-file (make-abcl-class-file :pathname filespec 7390 :lambda-name name 7391 :lambda-list (cadr form))) 7385 (let* ((class-file (make-abcl-class-file :pathname filespec)) 7392 7386 (*compiler-error-bailout* 7393 7387 `(lambda () … … 7396 7390 :lambda-expression (make-compiler-error-form ',form) 7397 7391 :class-file 7398 (make-abcl-class-file :pathname ,filespec 7399 :lambda-name ',name 7400 :lambda-list (cadr ',form))) 7392 (make-abcl-class-file :pathname ,filespec)) 7401 7393 ,stream))) 7402 7394 (*compile-file-environment* environment)) -
trunk/abcl/src/org/armedbear/lisp/jvm.lisp
r13484 r13485 131 131 pathname ; pathname of output file 132 132 class-name 133 lambda-name134 lambda-list ; as advertised135 133 static-initializer 136 134 constructor … … 161 159 "java.util.UUID")))))) 162 160 163 (defun make-abcl-class-file (&key pathname lambda-name lambda-list)161 (defun make-abcl-class-file (&key pathname) 164 162 "Creates a `class-file' structure. If `pathname' is non-NIL, it's 165 163 used to derive a class name. If it is NIL, a random one created … … 171 169 :class class-name ; to be finalized 172 170 :class-name class-name 173 :lambda-name lambda-name174 :lambda-list lambda-list175 171 :access-flags '(:public :final)))) 176 172 (when *file-compilation*
Note: See TracChangeset
for help on using the changeset viewer.