X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fmacros.lisp;h=1976274b81a33aecb10089bad802ee98c1cb51ef;hb=0a82f2db352cc348d2107a882e50af222ff97ed3;hp=d01e788bfc057202bfc2ab0dd2589b4d1fa7d7fc;hpb=959057baab99d4328fc386aee3fcc812f5fcb3ed;p=sbcl.git

diff --git a/src/code/macros.lisp b/src/code/macros.lisp
index d01e788..1976274 100644
--- a/src/code/macros.lisp
+++ b/src/code/macros.lisp
@@ -128,7 +128,6 @@ the usual naming convention (names like *FOO*) for special variables"
   ;; will be cross-compiled correctly.
   #-sb-xc-host (setf (symbol-value name) value)
   #+sb-xc-host (progn
-		 (/show (symbol-package name))
 		 ;; Redefining our cross-compilation host's CL symbols
 		 ;; would be poor form.
 		 ;;
@@ -177,8 +176,8 @@ the usual naming convention (names like *FOO*) for special variables"
 		   ;; 2001-03-24
 		   (eval `(defconstant ,name ',value))))
 
-  (setf (info :variable :kind name) :constant)
-  (setf (info :variable :constant-value name) value)
+  (setf (info :variable :kind name) :constant
+	(info :variable :constant-value name) value)
   name)
 
 ;;;; DEFINE-COMPILER-MACRO
@@ -199,10 +198,11 @@ the usual naming convention (names like *FOO*) for special variables"
 			:environment environment)
       (let ((def `(lambda (,whole ,environment)
 		    ,@local-decs
-		    (block ,(function-name-block-name name)
+		    (block ,(fun-name-block-name name)
 		      ,body))))
 	`(sb!c::%define-compiler-macro ',name #',def ',lambda-list ,doc)))))
 (defun sb!c::%define-compiler-macro (name definition lambda-list doc)
+  (declare (ignore lambda-list))
   (sb!c::%%define-compiler-macro name definition doc))
 (defun sb!c::%%define-compiler-macro (name definition doc)
   (setf (sb!xc:compiler-macro-function name) definition)
@@ -437,24 +437,9 @@ the usual naming convention (names like *FOO*) for special variables"
   #!+sb-doc
   "DECLAIM Declaration*
   Do a declaration or declarations for the global environment."
-  #-sb-xc-host
   `(eval-when (:compile-toplevel :load-toplevel :execute)
-     ,@(mapcar #'(lambda (x)
-		   `(sb!xc:proclaim ',x))
-	       specs))
-  ;; KLUDGE: The definition above doesn't work in the cross-compiler,
-  ;; because UNCROSS translates SB!XC:PROCLAIM into CL:PROCLAIM before
-  ;; the form gets executed. Instead, we have to explicitly do the
-  ;; proclamation at macroexpansion time. -- WHN ca. 19990810
-  ;;
-  ;; FIXME: Maybe we don't need this special treatment any more now
-  ;; that we're using DEFMACRO-MUNDANELY instead of DEFMACRO?
-  #+sb-xc-host (progn
-		 (mapcar #'sb!xc:proclaim specs)
-		 `(progn
-		    ,@(mapcar #'(lambda (x)
-				  `(sb!xc:proclaim ',x))
-			      specs))))
+     ,@(mapcar (lambda (spec) `(sb!xc:proclaim ',spec))
+	       specs)))
 
 (defmacro-mundanely print-unreadable-object ((object stream &key type identity)
 					     &body body)