X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Ftarget-error.lisp;h=ef1eea847ce300f0157c2f03d379b3f1536ba82b;hb=104ee7ee303efa16e415f5e75df635ac54dba733;hp=72ca0f04ae96f1912e76118253579f319a38f053;hpb=ba7659c92f2b7fac7e9532a3db9114c5bdc4ab55;p=sbcl.git

diff --git a/src/code/target-error.lisp b/src/code/target-error.lisp
index 72ca0f0..ef1eea8 100644
--- a/src/code/target-error.lisp
+++ b/src/code/target-error.lisp
@@ -26,7 +26,7 @@
   function
   report-function
   interactive-function
-  (test-function #'(lambda (cond) (declare (ignore cond)) t)))
+  (test-fun (lambda (cond) (declare (ignore cond)) t)))
 (def!method print-object ((restart restart) stream)
   (if *print-escape*
       (print-unreadable-object (restart stream :type t :identity t)
@@ -36,8 +36,8 @@
 (defun compute-restarts (&optional condition)
   #!+sb-doc
   "Return a list of all the currently active restarts ordered from most
-   recently established to less recently established. If Condition is
-   specified, then only restarts associated with Condition (or with no
+   recently established to less recently established. If CONDITION is
+   specified, then only restarts associated with CONDITION (or with no
    condition) will be returned."
   (let ((associated ())
 	(other ()))
@@ -51,7 +51,7 @@
 	  (when (and (or (not condition)
 			 (member restart associated)
 			 (not (member restart other)))
-		     (funcall (restart-test-function restart) condition))
+		     (funcall (restart-test-fun restart) condition))
 	    (res restart))))
       (res))))
 
@@ -62,9 +62,9 @@
 (defun restart-report (restart stream)
   (funcall (or (restart-report-function restart)
 	       (let ((name (restart-name restart)))
-		 #'(lambda (stream)
-		     (if name (format stream "~S" name)
-			      (format stream "~S" restart)))))
+		 (lambda (stream)
+		   (if name (format stream "~S" name)
+		       (format stream "~S" restart)))))
 	   stream))
 
 (defmacro with-condition-restarts (condition-form restarts-form &body body)
@@ -90,18 +90,18 @@
    the same restart name, FIND-RESTART will find the first such clause."
   `(let ((*restart-clusters*
 	  (cons (list
-		 ,@(mapcar #'(lambda (binding)
-			       (unless (or (car binding)
-					   (member :report-function
-						   binding
-						   :test #'eq))
-				 (warn "Unnamed restart does not have a ~
+		 ,@(mapcar (lambda (binding)
+			     (unless (or (car binding)
+					 (member :report-function
+						 binding
+						 :test #'eq))
+			       (warn "Unnamed restart does not have a ~
 					report function: ~S"
-				       binding))
-			       `(make-restart :name ',(car binding)
-					      :function ,(cadr binding)
-					      ,@(cddr binding)))
-			       bindings))
+				     binding))
+			     `(make-restart :name ',(car binding)
+					    :function ,(cadr binding)
+					    ,@(cddr binding)))
+			   bindings))
 		*restart-clusters*)))
      ,@forms))
 
@@ -112,9 +112,9 @@
    returned. It is an error to supply NIL as a name. If CONDITION is specified
    and not NIL, then only restarts associated with that condition (or with no
    condition) will be returned."
-  (find-if #'(lambda (x)
-	       (or (eq x name)
-		   (eq (restart-name x) name)))
+  (find-if (lambda (x)
+	     (or (eq x name)
+		 (eq (restart-name x) name)))
 	   (compute-restarts condition)))
 
 (defun invoke-restart (restart &rest values)
@@ -206,9 +206,7 @@
 				   :interactive-function
 				   result)))
 	     (when test
-	       (setq result (list* `#',test
-				   :test-function
-				   result)))
+	       (setq result (list* `#',test :test-fun result)))
 	     (nreverse result)))
 	 (parse-keyword-pairs (list keys)
 	   (do ((l list (cddr l))
@@ -259,25 +257,25 @@
 	 (let ((,temp-var nil))
 	   (tagbody
 	    (restart-bind
-		,(mapcar #'(lambda (datum)
-			     (let ((name (nth 0 datum))
-				   (tag  (nth 1 datum))
-				   (keys (nth 2 datum)))
-			       `(,name #'(lambda (&rest temp)
-					   (setq ,temp-var temp)
-					   (go ,tag))
-				       ,@keys)))
+		,(mapcar (lambda (datum)
+			   (let ((name (nth 0 datum))
+				 (tag  (nth 1 datum))
+				 (keys (nth 2 datum)))
+			     `(,name #'(lambda (&rest temp)
+					 (setq ,temp-var temp)
+					 (go ,tag))
+				     ,@keys)))
 			 data)
 	      (return-from ,block-tag
 			   ,(munge-restart-case-expression expression data)))
-	    ,@(mapcan #'(lambda (datum)
-			  (let ((tag  (nth 1 datum))
-				(bvl  (nth 3 datum))
-				(body (nth 4 datum)))
-			    (list tag
-				  `(return-from ,block-tag
-						(apply #'(lambda ,bvl ,@body)
-						       ,temp-var)))))
+	    ,@(mapcan (lambda (datum)
+			(let ((tag  (nth 1 datum))
+			      (bvl  (nth 3 datum))
+			      (body (nth 4 datum)))
+			  (list tag
+				`(return-from ,block-tag
+				   (apply (lambda ,bvl ,@body)
+					  ,temp-var)))))
 		      data)))))))
 
 (defmacro with-simple-restart ((restart-name format-string
@@ -288,7 +286,7 @@
    body)
    If restart-name is not invoked, then all values returned by forms are
    returned. If control is transferred to this restart, it immediately
-   returns the values nil and t."
+   returns the values NIL and T."
   `(restart-case
        ;; If there's just one body form, then don't use PROGN. This allows
        ;; RESTART-CASE to "see" calls to ERROR, etc.
@@ -315,7 +313,7 @@
     (when member-if
       (error "ill-formed handler binding: ~S" (first member-if))))
   `(let ((*handler-clusters*
-	  (cons (list ,@(mapcar #'(lambda (x) `(cons ',(car x) ,(cadr x)))
+	  (cons (list ,@(mapcar (lambda (x) `(cons ',(car x) ,(cadr x)))
 				bindings))
 		*handler-clusters*)))
      (multiple-value-prog1