X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fdefboot.lisp;h=fdec8087a2396789a874494e5b737f364295b8c6;hb=ec2616d216958a608581802c47496c0194478dc8;hp=c0f5127d5ff5fae8b0d3020913f2b871b8eb814b;hpb=e8b69b1dd5564a4237b1bdc1060820c3b820cde2;p=sbcl.git

diff --git a/src/code/defboot.lisp b/src/code/defboot.lisp
index c0f5127..fdec808 100644
--- a/src/code/defboot.lisp
+++ b/src/code/defboot.lisp
@@ -58,8 +58,8 @@
 	((list-of-symbols-p vars)
 	 (let ((temps (make-gensym-list (length vars))))
 	   `(multiple-value-bind ,temps ,value-form
-	      ,@(mapcar #'(lambda (var temp)
-			    `(setq ,var ,temp))
+	      ,@(mapcar (lambda (var temp)
+			  `(setq ,var ,temp))
 			vars temps)
 	      ,(car temps))))
 	(t (error "Vars is not a list of symbols: ~S" vars))))
@@ -170,12 +170,14 @@
   (unless (symbol-package (fun-name-block-name name))
     (warn "DEFUN of uninterned symbol ~S (tricky for GENESIS)" name))
   (multiple-value-bind (forms decls doc) (parse-body body)
-    (let* (;; stuff shared between LAMBDA and INLINE-LAMBDA
+    (let* (;; stuff shared between LAMBDA and INLINE-LAMBDA and NAMED-LAMBDA
 	   (lambda-guts `(,args
 			  ,@decls
 			  (block ,(fun-name-block-name name)
 			    ,@forms)))
 	   (lambda `(lambda ,@lambda-guts))
+           #-sb-xc-host
+	   (named-lambda `(named-lambda ,name ,@lambda-guts))
 	   (inline-lambda
 	    (cond (;; Does the user not even want to inline?
 		   (not (inline-fun-name-p name))
@@ -204,6 +206,11 @@
 
 	 ;; In cross-compilation of toplevel DEFUNs, we arrange
 	 ;; for the LAMBDA to be statically linked by GENESIS.
+	 ;;
+	 ;; It may seem strangely inconsistent not to use NAMED-LAMBDA
+	 ;; here instead of LAMBDA. The reason is historical:
+	 ;; COLD-FSET was written before NAMED-LAMBDA, and has special
+	 ;; logic of its own to notify the compiler about NAME.
 	 #+sb-xc-host
 	 (cold-fset ,name ,lambda)
 
@@ -215,7 +222,7 @@
 		 ;; where the compiled LAMBDA first appears. In
 		 ;; cross-compilation, we manipulate the
 		 ;; previously-statically-linked LAMBDA here.
-		 #-sb-xc-host ,lambda
+		 #-sb-xc-host ,named-lambda
 		 #+sb-xc-host (fdefinition ',name)
 		 ,doc)))))
 #-sb-xc-host
@@ -277,11 +284,11 @@
 
 ;;;; iteration constructs
 
-;;; (These macros are defined in terms of a function DO-DO-BODY which
+;;; (These macros are defined in terms of a function FROB-DO-BODY which
 ;;; is also used by SB!INT:DO-ANONYMOUS. Since these macros should not
 ;;; be loaded on the cross-compilation host, but SB!INT:DO-ANONYMOUS
-;;; and DO-DO-BODY should be, these macros can't conveniently be in
-;;; the same file as DO-DO-BODY.)
+;;; and FROB-DO-BODY should be, these macros can't conveniently be in
+;;; the same file as FROB-DO-BODY.)
 (defmacro-mundanely do (varlist endlist &body body)
   #!+sb-doc
   "DO ({(Var [Init] [Step])}*) (Test Exit-Form*) Declaration* Form*
@@ -292,7 +299,7 @@
   are evaluated as a PROGN, with the result being the value of the DO. A block
   named NIL is established around the entire expansion, allowing RETURN to be
   used as an alternate exit mechanism."
-  (do-do-body varlist endlist body 'let 'psetq 'do nil))
+  (frob-do-body varlist endlist body 'let 'psetq 'do nil))
 (defmacro-mundanely do* (varlist endlist &body body)
   #!+sb-doc
   "DO* ({(Var [Init] [Step])}*) (Test Exit-Form*) Declaration* Form*
@@ -303,7 +310,7 @@
   the Exit-Forms are evaluated as a PROGN, with the result being the value
   of the DO. A block named NIL is established around the entire expansion,
   allowing RETURN to be used as an laternate exit mechanism."
-  (do-do-body varlist endlist body 'let* 'setq 'do* nil))
+  (frob-do-body varlist endlist body 'let* 'setq 'do* nil))
 
 ;;; DOTIMES and DOLIST could be defined more concisely using
 ;;; destructuring macro lambda lists or DESTRUCTURING-BIND, but then