X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Ftarget-pathname.lisp;h=bf64660f4ef24120f2e5b0ca26f7eefc57795c6b;hb=5edd74f6911093805a009a152b32216b3dba59f7;hp=25cf000c5c1c4294ec8c6e903fd899f190ff0992;hpb=667ec9d494530079bef28e8589dd0d3274b935ec;p=sbcl.git

diff --git a/src/code/target-pathname.lisp b/src/code/target-pathname.lisp
index 25cf000..bf64660 100644
--- a/src/code/target-pathname.lisp
+++ b/src/code/target-pathname.lisp
@@ -120,22 +120,22 @@
   (let ((pieces1 (pattern-pieces pattern1))
 	(pieces2 (pattern-pieces pattern2)))
     (and (= (length pieces1) (length pieces2))
-	 (every #'(lambda (piece1 piece2)
-		    (typecase piece1
-		      (simple-string
-		       (and (simple-string-p piece2)
-			    (string= piece1 piece2)))
-		      (cons
-		       (and (consp piece2)
-			    (eq (car piece1) (car piece2))
-			    (string= (cdr piece1) (cdr piece2))))
-		      (t
-		       (eq piece1 piece2))))
+	 (every (lambda (piece1 piece2)
+		  (typecase piece1
+		    (simple-string
+		     (and (simple-string-p piece2)
+			  (string= piece1 piece2)))
+		    (cons
+		     (and (consp piece2)
+			  (eq (car piece1) (car piece2))
+			  (string= (cdr piece1) (cdr piece2))))
+		    (t
+		     (eq piece1 piece2))))
 		pieces1
 		pieces2))))
 
-;;; If the string matches the pattern returns the multiple values T and a
-;;; list of the matched strings.
+;;; If the string matches the pattern returns the multiple values T
+;;; and a list of the matched strings.
 (defun pattern-matches (pattern string)
   (declare (type pattern pattern)
 	   (type simple-string string))
@@ -335,19 +335,19 @@
 		 (typecase thing
 		   (pattern
 		    (make-pattern
-		     (mapcar #'(lambda (piece)
-				 (typecase piece
-				   (simple-base-string
-				    (funcall fun piece))
-				   (cons
-				    (case (car piece)
-				      (:character-set
-				       (cons :character-set
-					     (funcall fun (cdr piece))))
-				      (t
-				       piece)))
-				   (t
-				    piece)))
+		     (mapcar (lambda (piece)
+			       (typecase piece
+				 (simple-base-string
+				  (funcall fun piece))
+				 (cons
+				  (case (car piece)
+				    (:character-set
+				     (cons :character-set
+					   (funcall fun (cdr piece))))
+				    (t
+				     piece)))
+				 (t
+				  piece)))
 			     (pattern-pieces thing))))
 		   (list
 		    (mapcar fun thing))
@@ -358,20 +358,20 @@
 	(let ((any-uppers (check-for #'upper-case-p thing))
 	      (any-lowers (check-for #'lower-case-p thing)))
 	  (cond ((and any-uppers any-lowers)
-		 ;; Mixed case, stays the same.
+		 ;; mixed case, stays the same
 		 thing)
 		(any-uppers
-		 ;; All uppercase, becomes all lower case.
-		 (diddle-with #'(lambda (x) (if (stringp x)
-						(string-downcase x)
-						x)) thing))
+		 ;; all uppercase, becomes all lower case
+		 (diddle-with (lambda (x) (if (stringp x)
+					      (string-downcase x)
+					      x)) thing))
 		(any-lowers
-		 ;; All lowercase, becomes all upper case.
-		 (diddle-with #'(lambda (x) (if (stringp x)
-						(string-upcase x)
-						x)) thing))
+		 ;; all lowercase, becomes all upper case
+		 (diddle-with (lambda (x) (if (stringp x)
+					      (string-upcase x)
+					      x)) thing))
 		(t
-		 ;; No letters?  I guess just leave it.
+		 ;; no letters?  I guess just leave it.
 		 thing))))
       thing))
 
@@ -950,7 +950,7 @@ a host-structure or string."
     (collect ((subs))
       (loop
 	(unless source
-	  (unless (every #'(lambda (x) (eq x :wild-inferiors)) from)
+	  (unless (every (lambda (x) (eq x :wild-inferiors)) from)
 	    (didnt-match-error orig-source orig-from))
 	  (subs ())
 	  (return))
@@ -1086,7 +1086,7 @@ a host-structure or string."
 	  (error 'namestring-parse-error
 		 :complaint "logical namestring character which ~
 			     is not alphanumeric or hyphen:~%  ~S"
-		 :arguments (list ch)
+		 :args (list ch)
 		 :namestring word :offset i))))
     word))
 
@@ -1139,7 +1139,7 @@ a host-structure or string."
 		  (error 'namestring-parse-error
 			 :complaint "double asterisk inside of logical ~
 				     word: ~S"
-			 :arguments (list chunk)
+			 :args (list chunk)
 			 :namestring namestring
 			 :offset (+ (cdar chunks) pos)))
 		(pattern (subseq chunk last-pos pos)))
@@ -1173,7 +1173,7 @@ a host-structure or string."
 	  (unless (member ch '(#\; #\: #\.))
 	    (error 'namestring-parse-error
 		   :complaint "illegal character for logical pathname:~%  ~S"
-		   :arguments (list ch)
+		   :args (list ch)
 		   :namestring namestr
 		   :offset i))
 	  (chunks (cons ch i)))))
@@ -1193,7 +1193,7 @@ a host-structure or string."
 		 (unless (and chunks (simple-string-p (caar chunks)))
 		   (error 'namestring-parse-error
 			  :complaint "expecting ~A, got ~:[nothing~;~S~]."
-			  :arguments (list what (caar chunks) (caar chunks))
+			  :args (list what (caar chunks) (caar chunks))
 			  :namestring namestr
 			  :offset (if chunks (cdar chunks) end)))
 		 (caar chunks))
@@ -1235,7 +1235,7 @@ a host-structure or string."
 		   (unless (eql (caar chunks) #\.)
 		     (error 'namestring-parse-error
 			    :complaint "expecting a dot, got ~S."
-			    :arguments (list (caar chunks))
+			    :args (list (caar chunks))
 			    :namestring namestr
 			    :offset (cdar chunks)))
 		   (if type
@@ -1258,7 +1258,7 @@ a host-structure or string."
 			 (error 'namestring-parse-error
 				:complaint "expected a positive integer, ~
 					    got ~S"
-				:arguments (list str)
+				:args (list str)
 				:namestring namestr
 				:offset (+ pos (cdar chunks))))
 		       (setq version res)))))