X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fmacros.lisp;h=7e7783aedaf1c6f4f9f4d11d4bd76ff500e7e86a;hb=b63c81837c2eae7bcf3b09911f68ba62d102b63d;hp=51214a49c27aec6a6c0f5403b0c681746b4f922a;hpb=96de323a7da5d9f72473b48625dcb6d084ec0a3b;p=sbcl.git

diff --git a/src/code/macros.lisp b/src/code/macros.lisp
index 51214a4..7e7783a 100644
--- a/src/code/macros.lisp
+++ b/src/code/macros.lisp
@@ -100,7 +100,6 @@
 	    :format-control "Symbol macro name already declared constant: ~S."
 	    :format-arguments (list name))))
   name)
-
 
 ;;;; DEFINE-COMPILER-MACRO
 
@@ -128,8 +127,7 @@
     (error 'simple-program-error
 	   :format-control "cannot define a compiler-macro for a special operator: ~S"
 	   :format-arguments (list name)))
-  (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 name 'define-compiler-macro
 			:environment environment)
@@ -139,7 +137,11 @@
 		      ,body)))
 	    (debug-name (debug-namify "DEFINE-COMPILER-MACRO ~S" name)))
 	`(eval-when (:compile-toplevel :load-toplevel :execute)
-	  (sb!c::%define-compiler-macro ',name #',def ',lambda-list ,doc ,debug-name))))))
+	  (sb!c::%define-compiler-macro ',name
+					#',def
+					',lambda-list
+					,doc
+					,debug-name))))))
 
 ;;; FIXME: This will look remarkably similar to those who have already
 ;;; seen the code for %DEFMACRO in src/code/defmacro.lisp.  Various
@@ -174,11 +176,11 @@
 	     name))))
   (progn
     (def (:load-toplevel :execute) #-sb-xc-host t #+sb-xc-host nil)
-    (def (:compile-toplevel) nil)))
+    #-sb-xc (def (:compile-toplevel) nil)))
 
 ;;;; CASE, TYPECASE, and friends
 
-(eval-when (:compile-toplevel :load-toplevel :execute)
+(eval-when (#-sb-xc :compile-toplevel :load-toplevel :execute)
 
 ;;; CASE-BODY returns code for all the standard "case" macros. NAME is
 ;;; the macro name, and KEYFORM is the thing to case on. MULTI-P