X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fdefboot.lisp;h=8329bc7a78f9e8096296b6850347476e06cab6fb;hb=0b96758f3645dff3e681d82cc97ddab1faae27ac;hp=625e979ff6a76bea5211f6afb9222681ba94a0f6;hpb=25422d88edd9bf712206aee5143a4f952981b4d5;p=sbcl.git diff --git a/src/code/defboot.lisp b/src/code/defboot.lisp index 625e979..8329bc7 100644 --- a/src/code/defboot.lisp +++ b/src/code/defboot.lisp @@ -40,7 +40,8 @@ `(let ((,(car vars) ,value-form)) ,@body) (let ((ignore (gensym))) - `(multiple-value-call #'(lambda (&optional ,@vars &rest ,ignore) + `(multiple-value-call #'(lambda (&optional ,@(mapcar #'list vars) + &rest ,ignore) (declare (ignore ,ignore)) ,@body) ,value-form))) @@ -183,7 +184,7 @@ (cold-fset ,name ,lambda) (eval-when (:compile-toplevel) - (sb!c:%compiler-defun ',name ',inline-lambda)) + (sb!c:%compiler-defun ',name ',inline-lambda t)) (eval-when (:load-toplevel :execute) (%defun ',name ;; In normal compilation (not for cold load) this is @@ -200,7 +201,7 @@ (declare (type function def)) (declare (type (or null simple-string) doc)) (aver (legal-fun-name-p name)) ; should've been checked by DEFMACRO DEFUN - (sb!c:%compiler-defun name inline-lambda) + (sb!c:%compiler-defun name inline-lambda nil) (when (fboundp name) (/show0 "redefining NAME in %DEFUN") (style-warn "redefining ~S in DEFUN" name)) @@ -211,7 +212,7 @@ ;; something sane, (1) doing so doesn't really fix the bug, and ;; (2) doing probably isn't even really safe. #+nil (setf (%fun-name def) name) - + (when doc (setf (fdocumentation name 'function) doc)) name) @@ -351,9 +352,8 @@ (defmacro-mundanely with-condition-restarts (condition-form restarts-form &body body) #!+sb-doc - "WITH-CONDITION-RESTARTS Condition-Form Restarts-Form Form* - Evaluates the Forms in a dynamic environment where the restarts in the list - Restarts-Form are associated with the condition returned by Condition-Form. + "Evaluates the BODY in a dynamic environment where the restarts in the list + RESTARTS-FORM are associated with the condition returned by CONDITION-FORM. This allows FIND-RESTART, etc., to recognize restarts that are not related to the error currently being debugged. See also RESTART-CASE." (let ((n-cond (gensym))) @@ -378,7 +378,7 @@ binding :test #'eq)) (warn "Unnamed restart does not have a ~ - report function: ~S" + report function: ~S" binding)) `(make-restart :name ',(car binding) :function ,(cadr binding)