X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fearly-setf.lisp;h=e4f43ed81e8f034f36585eebcf71175e03cc9e36;hb=a0d9e7847b870acfbea98b01469654d01a8cf920;hp=8c5235a52dc49adf4062c0f714aa05c3cdcf7a85;hpb=0c9dcfb55e73398a3df8b1cc26d601b45685f29f;p=sbcl.git

diff --git a/src/code/early-setf.lisp b/src/code/early-setf.lisp
index 8c5235a..e4f43ed 100644
--- a/src/code/early-setf.lisp
+++ b/src/code/early-setf.lisp
@@ -91,7 +91,8 @@ GET-SETF-EXPANSION directly."
 
 ;;; If a macro, expand one level and try again. If not, go for the
 ;;; SETF function.
-(declaim (ftype (function (t sb!c::lexenv)) expand-or-get-setf-inverse))
+(declaim (ftype (function (t (or null sb!c::lexenv)))
+		expand-or-get-setf-inverse))
 (defun expand-or-get-setf-inverse (form environment)
   (multiple-value-bind (expansion expanded)
       (sb!xc:macroexpand-1 form environment)
@@ -372,14 +373,14 @@ GET-SETF-EXPANSION directly."
 		     (%defsetf ,access-form-var ,(length store-variables)
 			       (lambda (,arglist-var)
 				 ,@local-decs
-				 (block ,access-fn
-				   ,body))))
+                                 ,body)))
 		   nil
 		   ',doc))))))
 	(t
 	 (error "ill-formed DEFSETF for ~S" access-fn))))
 
 (defun %defsetf (orig-access-form num-store-vars expander)
+  (declare (type function expander))
   (let (subforms
 	subform-vars
 	subform-exprs
@@ -413,8 +414,7 @@ GET-SETF-EXPANSION directly."
   (unless (symbolp access-fn)
     (error "DEFINE-SETF-EXPANDER access-function name ~S is not a symbol."
 	   access-fn))
-  (let ((whole (gensym "WHOLE-"))
-	(environment (gensym "ENV-")))
+  (with-unique-names (whole environment)
     (multiple-value-bind (body local-decs doc)
 	(parse-defmacro lambda-list whole body access-fn
 			'sb!xc:define-setf-expander
@@ -423,7 +423,7 @@ GET-SETF-EXPANSION directly."
 	 (assign-setf-macro ',access-fn
 			    (lambda (,whole ,environment)
 			      ,@local-decs
-			      (block ,access-fn ,body))
+			      ,body)
 			    nil
 			    ',doc)))))