X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fdefstruct.lisp;h=8ea7dae05f0229c63e61848adb8b57fa5017f37b;hb=2d0b882f9eabffe5e2d32c0e2e7ab06c96f4fea3;hp=384aab06eaf06ca33d93df7cbb2d9eab12a8db8f;hpb=d147d512602d761a2dcdfded506dd1a8f9a140dc;p=sbcl.git

diff --git a/src/code/defstruct.lisp b/src/code/defstruct.lisp
index 384aab0..8ea7dae 100644
--- a/src/code/defstruct.lisp
+++ b/src/code/defstruct.lisp
@@ -165,8 +165,8 @@
 ;;;; the legendary DEFSTRUCT macro itself (both CL:DEFSTRUCT and its
 ;;;; close personal friend SB!XC:DEFSTRUCT)
 
-;;; Return a list of forms to install print and make-load-form funs, mentioning
-;;; them in the expansion so that they can be compiled.
+;;; Return a list of forms to install PRINT and MAKE-LOAD-FORM funs,
+;;; mentioning them in the expansion so that they can be compiled.
 (defun class-method-definitions (defstruct)
   (let ((name (dd-name defstruct)))
     `((locally
@@ -210,9 +210,7 @@
 	,@(let ((def-con (dd-default-constructor defstruct)))
 	    (when (and def-con (not (dd-alternate-metaclass defstruct)))
 	      `((setf (structure-class-constructor (sb!xc:find-class ',name))
-		      #',def-con))))
-	;; FIXME: MAKE-LOAD-FORM is supposed to be handled here, too.
-	))))
+		      #',def-con))))))))
 ;;; FIXME: I really would like to make structure accessors less special,
 ;;; just ordinary inline functions. (Or perhaps inline functions with special
 ;;; compact implementations of their expansions, to avoid bloating the system.)
@@ -1269,8 +1267,7 @@
     (dolist (slot (dd-slots defstruct))
       (let ((dum (gensym))
 	    (name (dsd-name slot)))
-	(arglist `((,(intern (string name) "KEYWORD") ,dum)
-		   ,(dsd-default slot)))
+	(arglist `((,(keywordicate name) ,dum) ,(dsd-default slot)))
 	(types (dsd-type slot))
 	(vals dum)))
     (funcall creator