X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fdefstruct.lisp;h=76f3c83e49cf19f35a801174c28f037e7b494ee0;hb=65b5ab7e713d04e0d76bc0ee196374f6e57b922f;hp=aac8f2dc22761554f0d9b3b930c98983fc8f3677;hpb=cccc20daac3d6d4e1086f387055aa0b6ff8f47d1;p=sbcl.git diff --git a/src/code/defstruct.lisp b/src/code/defstruct.lisp index aac8f2d..76f3c83 100644 --- a/src/code/defstruct.lisp +++ b/src/code/defstruct.lisp @@ -47,12 +47,25 @@ ,@slot-vars)))))) (declaim (ftype (sfunction (defstruct-description list) function) - %Make-structure-instance-allocator)) + %make-structure-instance-allocator)) (defun %make-structure-instance-allocator (dd slot-specs) (let ((vars (make-gensym-list (length slot-specs)))) (values (compile nil `(lambda (,@vars) (%make-structure-instance-macro ,dd ',slot-specs ,@vars)))))) +(defun %make-funcallable-structure-instance-allocator (dd slot-specs) + (when slot-specs + (bug "funcallable-structure-instance allocation with slots unimplemented")) + (let ((name (dd-name dd)) + (length (dd-length dd)) + (nobject (gensym "OBJECT"))) + (values + (compile nil `(lambda () + (let ((,nobject (%make-funcallable-instance ,length))) + (setf (%funcallable-instance-layout ,nobject) + (%delayed-get-compiler-layout ,name)) + ,nobject)))))) + ;;; Delay looking for compiler-layout until the constructor is being ;;; compiled, since it doesn't exist until after the EVAL-WHEN ;;; (COMPILE) stuff is compiled. (Or, in the oddball case when @@ -259,9 +272,6 @@ (alignment 1 :type (integer 1 2) :read-only t)) (defvar *raw-slot-data-list* - #!+hppa - nil - #!-hppa (let ((double-float-alignment ;; white list of architectures that can load unaligned doubles: #!+(or x86 x86-64 ppc) 1 @@ -331,8 +341,8 @@ (declare (notinline find-classoid)) ,@(let ((pf (dd-print-function defstruct)) (po (dd-print-object defstruct)) - (x (gensym)) - (s (gensym))) + (x (sb!xc:gensym "OBJECT")) + (s (sb!xc:gensym "STREAM"))) ;; Giving empty :PRINT-OBJECT or :PRINT-FUNCTION options ;; leaves PO or PF equal to NIL. The user-level effect is ;; to generate a PRINT-OBJECT method specialized for the type, @@ -912,13 +922,13 @@ (unless (eq (classoid-layout classoid) layout) (register-layout layout))) (t + (%redefine-defstruct classoid old-layout layout) (let ((old-dd (layout-info old-layout))) (when (defstruct-description-p old-dd) (dolist (slot (dd-slots old-dd)) (fmakunbound (dsd-accessor-name slot)) (unless (dsd-read-only slot) (fmakunbound `(setf ,(dsd-accessor-name slot))))))) - (%redefine-defstruct classoid old-layout layout) (setq layout (classoid-layout classoid)))) (setf (find-classoid (dd-name dd)) classoid) @@ -979,6 +989,46 @@ ,(funcall (nth-value 1 (slot-accessor-transforms dd dsd)) '(dummy new-value instance))))) +;;; Blow away all the compiler info for the structure CLASS. Iterate +;;; over this type, clearing the compiler structure type info, and +;;; undefining all the associated functions. If SUBCLASSES-P, also do +;;; the same for subclasses. FIXME: maybe rename UNDEFINE-FUN-NAME to +;;; UNDECLARE-FUNCTION-NAME? +(defun undeclare-structure (classoid subclasses-p) + (let ((info (layout-info (classoid-layout classoid)))) + (when (defstruct-description-p info) + (let ((type (dd-name info))) + (remhash type *typecheckfuns*) + (setf (info :type :compiler-layout type) nil) + (undefine-fun-name (dd-copier-name info)) + (undefine-fun-name (dd-predicate-name info)) + (dolist (slot (dd-slots info)) + (let ((fun (dsd-accessor-name slot))) + (unless (accessor-inherited-data fun info) + (undefine-fun-name fun) + (unless (dsd-read-only slot) + (undefine-fun-name `(setf ,fun))))))) + ;; Clear out the SPECIFIER-TYPE cache so that subsequent + ;; references are unknown types. + (values-specifier-type-cache-clear))) + (when subclasses-p + (let ((subclasses (classoid-subclasses classoid))) + (when subclasses + (collect ((subs)) + (dohash ((classoid layout) + subclasses + :locked t) + (declare (ignore layout)) + (undeclare-structure classoid nil) + (subs (classoid-proper-name classoid))) + ;; Is it really necessary to warn about + ;; undeclaring functions for subclasses? + (when (subs) + (warn "undeclaring functions for old subclasses ~ + of ~S:~% ~S" + (classoid-name classoid) + (subs)))))))) + ;;; core compile-time setup of any class with a LAYOUT, used even by ;;; !DEFSTRUCT-WITH-ALTERNATE-METACLASS weirdosities (defun %compiler-set-up-layout (dd @@ -1000,23 +1050,21 @@ (info :type :compiler-layout (dd-name dd)) (ensure-structure-class dd inherits - (if clayout-p "previously compiled" "current") - "compiled" + (if clayout-p + "The most recently compiled" + "The current") + "the most recently loaded" :compiler-layout clayout)) (cond (old-layout - (undefine-structure (layout-classoid old-layout)) - (when (and (classoid-subclasses classoid) - (not (eq layout old-layout))) - (collect ((subs)) - (dohash ((classoid layout) (classoid-subclasses classoid) - :locked t) - (declare (ignore layout)) - (undefine-structure classoid) - (subs (classoid-proper-name classoid))) - (when (subs) - (warn "removing old subclasses of ~S:~% ~S" - (classoid-name classoid) - (subs)))))) + (undeclare-structure (layout-classoid old-layout) + (and (classoid-subclasses classoid) + (not (eq layout old-layout)))) + (setf (layout-invalid layout) nil) + ;; FIXME: it might be polite to hold onto old-layout and + ;; restore it at the end of the file. -- RMK 2008-09-19 + ;; (International Talk Like a Pirate Day). + (warn "~@" + classoid)) (t (unless (eq (classoid-layout classoid) layout) (register-layout layout :invalidate nil)) @@ -1195,7 +1243,7 @@ ;; included in that length to guarantee proper alignment of raw double float ;; slots, necessary for (at least) the SPARC backend. (let ((layout-length (dd-layout-length dd))) - (declare (index layout-length)) + (declare (type index layout-length)) (+ layout-length (mod (1+ layout-length) 2)))) ;;; This is called when we are about to define a structure class. It @@ -1274,28 +1322,6 @@ (error "shouldn't happen! strange thing in LAYOUT-INFO:~% ~S" old-layout) (values class new-layout old-layout))))))))) - -;;; Blow away all the compiler info for the structure CLASS. Iterate -;;; over this type, clearing the compiler structure type info, and -;;; undefining all the associated functions. -(defun undefine-structure (class) - (let ((info (layout-info (classoid-layout class)))) - (when (defstruct-description-p info) - (let ((type (dd-name info))) - (remhash type *typecheckfuns*) - (setf (info :type :compiler-layout type) nil) - (undefine-fun-name (dd-copier-name info)) - (undefine-fun-name (dd-predicate-name info)) - (dolist (slot (dd-slots info)) - (let ((fun (dsd-accessor-name slot))) - (unless (accessor-inherited-data fun info) - (undefine-fun-name fun) - (unless (dsd-read-only slot) - (undefine-fun-name `(setf ,fun))))))) - ;; Clear out the SPECIFIER-TYPE cache so that subsequent - ;; references are unknown types. - (values-specifier-type-cache-clear))) - (values)) ;;; Return a list of pairs (name . index). Used for :TYPE'd ;;; constructors to find all the names that we have to splice in & @@ -1421,7 +1447,7 @@ (types) (vals)) (dolist (slot (dd-slots defstruct)) - (let ((dum (gensym)) + (let ((dum (sb!xc:gensym "DUM")) (name (dsd-name slot))) (arglist `((,(keywordicate name) ,dum) ,(dsd-default slot))) (types (dsd-type slot)) @@ -1509,12 +1535,12 @@ (when auxp (arglist '&aux) (dolist (arg aux) - (arglist arg) (if (proper-list-of-length-p arg 2) - (let ((var (first arg))) - (vars var) - (types (get-slot var))) - (skipped-vars (if (consp arg) (first arg) arg)))))) + (let ((var (first arg))) + (arglist arg) + (vars var) + (types (get-slot var))) + (skipped-vars (if (consp arg) (first arg) arg)))))) (funcall creator defstruct (first boa) (arglist) (vars) (types) @@ -1687,6 +1713,8 @@ (eval-when (:compile-toplevel :load-toplevel :execute) (%compiler-set-up-layout ',dd ',(inherits-for-structure dd)))))) +(sb!xc:proclaim '(special *defstruct-hooks*)) + (sb!xc:defmacro !defstruct-with-alternate-metaclass (class-name &key (slot-names (missing-arg)) @@ -1716,8 +1744,8 @@ :dd-type dd-type)) (dd-slots (dd-slots dd)) (dd-length (1+ (length slot-names))) - (object-gensym (gensym "OBJECT")) - (new-value-gensym (gensym "NEW-VALUE-")) + (object-gensym (sb!xc:gensym "OBJECT")) + (new-value-gensym (sb!xc:gensym "NEW-VALUE-")) (delayed-layout-form `(%delayed-get-compiler-layout ,class-name))) (multiple-value-bind (raw-maker-form raw-reffer-operator) (ecase dd-type @@ -1781,7 +1809,11 @@ ;; code, which knows how to generate inline type tests ;; for the whole CMU CL INSTANCE menagerie. `(defun ,predicate (,object-gensym) - (typep ,object-gensym ',class-name))))))) + (typep ,object-gensym ',class-name))) + + (when (boundp '*defstruct-hooks*) + (dolist (fun *defstruct-hooks*) + (funcall fun (find-classoid ',(dd-name dd))))))))) ;;;; finalizing bootstrapping