X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fdefstruct.lisp;h=52880e82bfc9eea219b5b3762d378bfefe04ac76;hb=b8f63d9b4e978bec3bfc1f4fc471e5ed946781fd;hp=5a443c93c284a46ca5308b479f9599f509f1f0f3;hpb=cea4896b2482b7b2b429c1631d774b4cfbc0efba;p=sbcl.git

diff --git a/src/code/defstruct.lisp b/src/code/defstruct.lisp
index 5a443c9..52880e8 100644
--- a/src/code/defstruct.lisp
+++ b/src/code/defstruct.lisp
@@ -150,7 +150,7 @@
   (intern (string (dsd-%name dsd))
 	  (if (dsd-accessor dsd)
 	      (symbol-package (dsd-accessor dsd))
-	      *package*)))
+	      (sane-package))))
 
 ;;;; typed (non-class) structures
 
@@ -590,7 +590,7 @@
 	spec))
 
     (when (find name (dd-slots defstruct) :test #'string= :key #'dsd-%name)
-      (error 'program-error
+      (error 'simple-program-error
 	     :format-control "duplicate slot name ~S"
 	     :format-arguments (list name)))
     (setf (dsd-%name islot) (string name))
@@ -1228,10 +1228,10 @@
 	       (%delayed-get-compiler-layout ,(dd-name defstruct)))
 	 ,@(when n-raw-data
 	     `((setf (%instance-ref ,temp ,raw-index) ,n-raw-data)))
-	 ,@(mapcar #'(lambda (dsd value)
-		       (multiple-value-bind (accessor index data)
-			   (slot-accessor-form defstruct dsd temp n-raw-data)
-			 `(setf (,accessor ,data ,index) ,value)))
+	 ,@(mapcar (lambda (dsd value)
+		     (multiple-value-bind (accessor index data)
+			 (slot-accessor-form defstruct dsd temp n-raw-data)
+		       `(setf (,accessor ,data ,index) ,value)))
 		   (dd-slots defstruct)
 		   values)
 	 ,temp))))
@@ -1269,7 +1269,7 @@
 	     defstruct (dd-default-constructor defstruct)
 	     (arglist) (vals) (types) (vals))))
 
-;;; Given a structure and a BOA constructor spec, call Creator with
+;;; Given a structure and a BOA constructor spec, call CREATOR with
 ;;; the appropriate args to make a constructor.
 (defun create-boa-constructor (defstruct boa creator)
   (multiple-value-bind (req opt restp rest keyp keys allowp aux)