Diff of /contrib/asdf/asdf.lisp [79cc56] .. [4898ef] Maximize Restore

  Switch to side-by-side view

--- a/contrib/asdf/asdf.lisp
+++ b/contrib/asdf/asdf.lisp
@@ -39,67 +39,67 @@
 
 (defpackage #:asdf
   (:export #:defsystem #:oos #:operate #:find-system #:run-shell-command
-	   #:system-definition-pathname #:find-component ; miscellaneous
-	   #:hyperdocumentation #:hyperdoc
-	   
-	   #:compile-op #:load-op #:load-source-op #:test-system-version
-	   #:test-op
-	   #:operation			; operations
-	   #:feature			; sort-of operation
-	   #:version			; metaphorically sort-of an operation
-	   
-	   #:input-files #:output-files #:perform	; operation methods
-	   #:operation-done-p #:explain
-	   
-	   #:component #:source-file 
-	   #:c-source-file #:cl-source-file #:java-source-file
-	   #:static-file
-	   #:doc-file
-	   #:html-file
-	   #:text-file
-	   #:source-file-type
-	   #:module			; components
-	   #:system
-	   #:unix-dso
-	   
-	   #:module-components		; component accessors
-	   #:component-pathname
-	   #:component-relative-pathname
-	   #:component-name
-	   #:component-version
-	   #:component-parent
-	   #:component-property
-	   #:component-system
-	   
-	   #:component-depends-on
-
-	   #:system-description
-	   #:system-long-description
-	   #:system-author
-	   #:system-maintainer
-	   #:system-license
-	   
-	   #:operation-on-warnings
-	   #:operation-on-failure
-	   
-	   ;#:*component-parent-pathname* 
-	   #:*system-definition-search-functions*
-	   #:*central-registry*		; variables
-	   #:*compile-file-warnings-behaviour*
-	   #:*compile-file-failure-behaviour*
-	   #:*asdf-revision*
-	   
-	   #:operation-error #:compile-failed #:compile-warned #:compile-error
-	   #:error-component #:error-operation
-	   #:system-definition-error 
-	   #:missing-component
-	   #:missing-dependency
-	   #:circular-dependency	; errors
-
-	   #:retry
-	   #:accept                     ; restarts
-	   
-	   )
+           #:system-definition-pathname #:find-component ; miscellaneous
+           #:hyperdocumentation #:hyperdoc
+
+           #:compile-op #:load-op #:load-source-op #:test-system-version
+           #:test-op
+           #:operation                  ; operations
+           #:feature                    ; sort-of operation
+           #:version                    ; metaphorically sort-of an operation
+
+           #:input-files #:output-files #:perform       ; operation methods
+           #:operation-done-p #:explain
+
+           #:component #:source-file
+           #:c-source-file #:cl-source-file #:java-source-file
+           #:static-file
+           #:doc-file
+           #:html-file
+           #:text-file
+           #:source-file-type
+           #:module                     ; components
+           #:system
+           #:unix-dso
+
+           #:module-components          ; component accessors
+           #:component-pathname
+           #:component-relative-pathname
+           #:component-name
+           #:component-version
+           #:component-parent
+           #:component-property
+           #:component-system
+
+           #:component-depends-on
+
+           #:system-description
+           #:system-long-description
+           #:system-author
+           #:system-maintainer
+           #:system-license
+
+           #:operation-on-warnings
+           #:operation-on-failure
+
+           ;#:*component-parent-pathname*
+           #:*system-definition-search-functions*
+           #:*central-registry*         ; variables
+           #:*compile-file-warnings-behaviour*
+           #:*compile-file-failure-behaviour*
+           #:*asdf-revision*
+
+           #:operation-error #:compile-failed #:compile-warned #:compile-error
+           #:error-component #:error-operation
+           #:system-definition-error
+           #:missing-component
+           #:missing-dependency
+           #:circular-dependency        ; errors
+
+           #:retry
+           #:accept                     ; restarts
+
+           )
   (:use :cl))
 
 #+nil
@@ -109,13 +109,13 @@
 (in-package #:asdf)
 
 (defvar *asdf-revision* (let* ((v "$Revision$")
-			       (colon (or (position #\: v) -1))
-			       (dot (position #\. v)))
-			  (and v colon dot 
-			       (list (parse-integer v :start (1+ colon)
-						    :junk-allowed t)
-				     (parse-integer v :start (1+ dot)
-						    :junk-allowed t)))))
+                               (colon (or (position #\: v) -1))
+                               (dot (position #\. v)))
+                          (and v colon dot
+                               (list (parse-integer v :start (1+ colon)
+                                                    :junk-allowed t)
+                                     (parse-integer v :start (1+ dot)
+                                                    :junk-allowed t)))))
 
 (defvar *compile-file-warnings-behaviour* :warn)
 (defvar *compile-file-failure-behaviour* #+sbcl :error #-sbcl :warn)
@@ -133,8 +133,8 @@
 and NIL NAME and TYPE components"
   (make-pathname :name nil :type nil :defaults pathname))
 
-(define-modify-macro appendf (&rest args) 
-		     append "Append onto list") 
+(define-modify-macro appendf (&rest args)
+                     append "Append onto list")
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; classes, condiitons
@@ -152,7 +152,7 @@
   ((format-control :initarg :format-control :reader format-control)
    (format-arguments :initarg :format-arguments :reader format-arguments))
   (:report (lambda (c s)
-	     (apply #'format s (format-control c) (format-arguments c)))))
+             (apply #'format s (format-control c) (format-arguments c)))))
 
 (define-condition circular-dependency (system-definition-error)
   ((components :initarg :components :reader circular-dependency-components)))
@@ -169,15 +169,15 @@
   ((component :reader error-component :initarg :component)
    (operation :reader error-operation :initarg :operation))
   (:report (lambda (c s)
-	     (format s "~@<erred while invoking ~A on ~A~@:>"
-		     (error-operation c) (error-component c)))))
+             (format s "~@<erred while invoking ~A on ~A~@:>"
+                     (error-operation c) (error-component c)))))
 (define-condition compile-error (operation-error) ())
 (define-condition compile-failed (compile-error) ())
 (define-condition compile-warned (compile-error) ())
 
 (defclass component ()
   ((name :accessor component-name :initarg :name :documentation
-	 "Component name: designator for a string composed of portable pathname characters")
+         "Component name: designator for a string composed of portable pathname characters")
    (version :accessor component-version :initarg :version)
    (in-order-to :initform nil :initarg :in-order-to)
    ;;; XXX crap name
@@ -191,17 +191,17 @@
    ;; it to default in funky ways if not supplied
    (relative-pathname :initarg :pathname)
    (operation-times :initform (make-hash-table )
-		    :accessor component-operation-times)
+                    :accessor component-operation-times)
    ;; XXX we should provide some atomic interface for updating the
    ;; component properties
    (properties :accessor component-properties :initarg :properties
-	       :initform nil)))
+               :initform nil)))
 
 ;;;; methods: conditions
 
 (defmethod print-object ((c missing-dependency) s)
   (format s "~@<~A, required by ~A~@:>"
-	  (call-next-method c nil) (missing-required-by c)))
+          (call-next-method c nil) (missing-required-by c)))
 
 (defun sysdef-error (format &rest arguments)
   (error 'formatted-system-definition-error :format-control format :format-arguments arguments))
@@ -212,14 +212,14 @@
   (format s "~@<component ~S not found~
              ~@[ or does not match version ~A~]~
              ~@[ in ~A~]~@:>"
-	  (missing-requires c)
-	  (missing-version c)
-	  (when (missing-parent c)
-	    (component-name (missing-parent c)))))
+          (missing-requires c)
+          (missing-version c)
+          (when (missing-parent c)
+            (component-name (missing-parent c)))))
 
 (defgeneric component-system (component)
   (:documentation "Find the top-level system containing COMPONENT"))
-  
+
 (defmethod component-system ((component component))
   (aif (component-parent component)
        (component-system it)
@@ -235,8 +235,8 @@
    ;; what to do if we can't satisfy a dependency of one of this module's
    ;; components.  This allows a limited form of conditional processing
    (if-component-dep-fails :initform :fail
-			   :accessor module-if-component-dep-fails
-			   :initarg :if-component-dep-fails)
+                           :accessor module-if-component-dep-fails
+                           :initarg :if-component-dep-fails)
    (default-component-class :accessor module-default-component-class
      :initform 'cl-source-file :initarg :default-component-class)))
 
@@ -250,7 +250,7 @@
 
 (defgeneric component-relative-pathname (component)
   (:documentation "Extracts the relative pathname applicable for a particular component."))
-   
+
 (defmethod component-relative-pathname ((component module))
   (or (slot-value component 'relative-pathname)
       (make-pathname
@@ -271,9 +271,9 @@
 (defmethod (setf component-property) (new-value (c component) property)
   (let ((a (assoc property (slot-value c 'properties) :test #'equal)))
     (if a
-	(setf (cdr a) new-value)
-	(setf (slot-value c 'properties)
-	      (acons property new-value (slot-value c 'properties))))))
+        (setf (cdr a) new-value)
+        (setf (slot-value c 'properties)
+              (acons property new-value (slot-value c 'properties))))))
 
 (defclass system (module)
   ((description :accessor system-description :initarg :description)
@@ -291,13 +291,13 @@
     (nreverse
      (let ((list nil) (start 0) (words 0) end)
        (loop
-	(when (and max (>= words (1- max)))
-	  (return (cons (subseq string start) list)))
-	(setf end (position-if #'is-ws string :start start))
-	(push (subseq string start end) list)
-	(incf words)
-	(unless end (return list))
-	(setf start (1+ end)))))))
+        (when (and max (>= words (1- max)))
+          (return (cons (subseq string start) list)))
+        (setf end (position-if #'is-ws string :start start))
+        (push (subseq string start end) list)
+        (incf words)
+        (unless end (return list))
+        (setf start (1+ end)))))))
 
 (defgeneric version-satisfies (component version))
 
@@ -305,17 +305,17 @@
   (unless (and version (slot-boundp c 'version))
     (return-from version-satisfies t))
   (let ((x (mapcar #'parse-integer
-		   (split (component-version c) nil '(#\.))))
-	(y (mapcar #'parse-integer
-		   (split version nil '(#\.)))))
+                   (split (component-version c) nil '(#\.))))
+        (y (mapcar #'parse-integer
+                   (split version nil '(#\.)))))
     (labels ((bigger (x y)
-	       (cond ((not y) t)
-		     ((not x) nil)
-		     ((> (car x) (car y)) t)
-		     ((= (car x) (car y))
-		      (bigger (cdr x) (cdr y))))))
+               (cond ((not y) t)
+                     ((not x) nil)
+                     ((> (car x) (car y)) t)
+                     ((= (car x) (car y))
+                      (bigger (cdr x) (cdr y))))))
       (and (= (car x) (car y))
-	   (or (not (cdr y)) (bigger (cdr x) (cdr y)))))))
+           (or (not (cdr y)) (bigger (cdr x) (cdr y)))))))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; finding systems
@@ -336,8 +336,8 @@
 
 (defun system-definition-pathname (system)
   (some (lambda (x) (funcall x system))
-	*system-definition-search-functions*))
-	
+        *system-definition-search-functions*))
+
 (defvar *central-registry*
   '(*default-pathname-defaults*
     #+nil "/home/dan/src/sourceforge/cclan/asdf/systems/"
@@ -347,41 +347,41 @@
   (let ((name (coerce-name system)))
     (block nil
       (dolist (dir *central-registry*)
-	(let* ((defaults (eval dir))
-	       (file (and defaults
-			  (make-pathname
-			   :defaults defaults :version :newest
-			   :name name :type "asd" :case :local))))
-	  (if (and file (probe-file file))
-	      (return file)))))))
+        (let* ((defaults (eval dir))
+               (file (and defaults
+                          (make-pathname
+                           :defaults defaults :version :newest
+                           :name name :type "asd" :case :local))))
+          (if (and file (probe-file file))
+              (return file)))))))
 
 
 (defun find-system (name &optional (error-p t))
   (let* ((name (coerce-name name))
-	 (in-memory (gethash name *defined-systems*))
-	 (on-disk (system-definition-pathname name)))	 
+         (in-memory (gethash name *defined-systems*))
+         (on-disk (system-definition-pathname name)))
     (when (and on-disk
-	       (or (not in-memory)
-		   (< (car in-memory) (file-write-date on-disk))))
+               (or (not in-memory)
+                   (< (car in-memory) (file-write-date on-disk))))
       (let ((*package* (make-package (gensym #.(package-name *package*))
-				     :use '(:cl :asdf))))
-	(format *verbose-out*
-		"~&~@<; ~@;loading system definition from ~A into ~A~@:>~%"
-		;; FIXME: This wants to be (ENOUGH-NAMESTRING
-		;; ON-DISK), but CMUCL barfs on that.
-		on-disk
-		*package*)
-	(load on-disk)))
+                                     :use '(:cl :asdf))))
+        (format *verbose-out*
+                "~&~@<; ~@;loading system definition from ~A into ~A~@:>~%"
+                ;; FIXME: This wants to be (ENOUGH-NAMESTRING
+                ;; ON-DISK), but CMUCL barfs on that.
+                on-disk
+                *package*)
+        (load on-disk)))
     (let ((in-memory (gethash name *defined-systems*)))
       (if in-memory
-	  (progn (if on-disk (setf (car in-memory) (file-write-date on-disk)))
-		 (cdr in-memory))
-	  (if error-p (error 'missing-component :requires name))))))
+          (progn (if on-disk (setf (car in-memory) (file-write-date on-disk)))
+                 (cdr in-memory))
+          (if error-p (error 'missing-component :requires name))))))
 
 (defun register-system (name system)
   (format *verbose-out* "~&~@<; ~@;registering ~A as ~A~@:>~%" system name)
   (setf (gethash (coerce-name  name) *defined-systems*)
-	(cons (get-universal-time) system)))
+        (cons (get-universal-time) system)))
 
 (defun system-registered-p (name)
   (gethash (coerce-name name) *defined-systems*))
@@ -397,9 +397,9 @@
 (defmethod find-component ((module module) name &optional version)
   (if (slot-boundp module 'components)
       (let ((m (find name (module-components module)
-		     :test #'equal :key #'component-name)))
-	(if (and m (version-satisfies m version)) m))))
-	    
+                     :test #'equal :key #'component-name)))
+        (if (and m (version-satisfies m version)) m))))
+
 
 ;;; a component with no parent is a system
 (defmethod find-component ((module (eql nil)) name &optional version)
@@ -426,16 +426,16 @@
 
 (defmethod component-relative-pathname ((component source-file))
   (let* ((*default-pathname-defaults* (component-parent-pathname component))
-	 (name-type
-	  (make-pathname
-	   :name (component-name component)
-	   :type (source-file-type component
-				   (component-system component)))))
+         (name-type
+          (make-pathname
+           :name (component-name component)
+           :type (source-file-type component
+                                   (component-system component)))))
     (if (slot-value component 'relative-pathname)
-	(merge-pathnames
-	 (slot-value component 'relative-pathname)
-	 name-type)
-	name-type)))
+        (merge-pathnames
+         (slot-value component 'relative-pathname)
+         name-type)
+        name-type)))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; operations
@@ -445,7 +445,7 @@
 (defclass operation ()
   ((forced :initform nil :initarg :force :accessor operation-forced)
    (original-initargs :initform nil :initarg :original-initargs
-		      :accessor operation-original-initargs)
+                      :accessor operation-original-initargs)
    (visited-nodes :initform nil :accessor operation-visited-nodes)
    (visiting-nodes :initform nil :accessor operation-visiting-nodes)
    (parent :initform nil :initarg :parent :accessor operation-parent)))
@@ -456,8 +456,8 @@
       (prin1 (operation-original-initargs o) stream))))
 
 (defmethod shared-initialize :after ((operation operation) slot-names
-				     &key force 
-				     &allow-other-keys)
+                                     &key force
+                                     &allow-other-keys)
   (declare (ignore slot-names force))
   ;; empty method to disable initarg validity checking
   )
@@ -482,22 +482,22 @@
 
 (defun make-sub-operation (c o dep-c dep-o)
   (let* ((args (copy-list (operation-original-initargs o)))
-	 (force-p (getf args :force)))
+         (force-p (getf args :force)))
     ;; note explicit comparison with T: any other non-NIL force value
     ;; (e.g. :recursive) will pass through
     (cond ((and (null (component-parent c))
-		(null (component-parent dep-c))
-		(not (eql c dep-c)))
-	   (when (eql force-p t)
-	     (setf (getf args :force) nil))
-	   (apply #'make-instance dep-o
-		  :parent o
-		  :original-initargs args args))
-	  ((subtypep (type-of o) dep-o)
-	   o)
-	  (t 
-	   (apply #'make-instance dep-o
-		  :parent o :original-initargs args args)))))
+                (null (component-parent dep-c))
+                (not (eql c dep-c)))
+           (when (eql force-p t)
+             (setf (getf args :force) nil))
+           (apply #'make-instance dep-o
+                  :parent o
+                  :original-initargs args args))
+          ((subtypep (type-of o) dep-o)
+           o)
+          (t
+           (apply #'make-instance dep-o
+                  :parent o :original-initargs args args)))))
 
 
 (defgeneric visit-component (operation component data))
@@ -505,14 +505,14 @@
 (defmethod visit-component ((o operation) (c component) data)
   (unless (component-visited-p o c)
     (push (cons (node-for o c) data)
-	  (operation-visited-nodes (operation-ancestor o)))))
+          (operation-visited-nodes (operation-ancestor o)))))
 
 (defgeneric component-visited-p (operation component))
 
 (defmethod component-visited-p ((o operation) (c component))
   (assoc (node-for o c)
-	 (operation-visited-nodes (operation-ancestor o))
-	 :test 'equal))
+         (operation-visited-nodes (operation-ancestor o))
+         :test 'equal))
 
 (defgeneric (setf visiting-component) (new-value operation component))
 
@@ -522,69 +522,69 @@
 
 (defmethod (setf visiting-component) (new-value (o operation) (c component))
   (let ((node (node-for o c))
-	(a (operation-ancestor o)))
+        (a (operation-ancestor o)))
     (if new-value
-	(pushnew node (operation-visiting-nodes a) :test 'equal)
-	(setf (operation-visiting-nodes a)
-	      (remove node  (operation-visiting-nodes a) :test 'equal)))))
+        (pushnew node (operation-visiting-nodes a) :test 'equal)
+        (setf (operation-visiting-nodes a)
+              (remove node  (operation-visiting-nodes a) :test 'equal)))))
 
 (defgeneric component-visiting-p (operation component))
 
 (defmethod component-visiting-p ((o operation) (c component))
   (let ((node (cons o c)))
     (member node (operation-visiting-nodes (operation-ancestor o))
-	    :test 'equal)))
+            :test 'equal)))
 
 (defgeneric component-depends-on (operation component))
 
 (defmethod component-depends-on ((o operation) (c component))
   (cdr (assoc (class-name (class-of o))
-	      (slot-value c 'in-order-to))))
+              (slot-value c 'in-order-to))))
 
 (defgeneric component-self-dependencies (operation component))
 
 (defmethod component-self-dependencies ((o operation) (c component))
   (let ((all-deps (component-depends-on o c)))
     (remove-if-not (lambda (x)
-		     (member (component-name c) (cdr x) :test #'string=))
-		   all-deps)))
-    
+                     (member (component-name c) (cdr x) :test #'string=))
+                   all-deps)))
+
 (defmethod input-files ((operation operation) (c component))
   (let ((parent (component-parent c))
-	(self-deps (component-self-dependencies operation c)))
+        (self-deps (component-self-dependencies operation c)))
     (if self-deps
-	(mapcan (lambda (dep)
-		  (destructuring-bind (op name) dep
-		    (output-files (make-instance op)
-				  (find-component parent name))))
-		self-deps)
-	;; no previous operations needed?  I guess we work with the 
-	;; original source file, then
-	(list (component-pathname c)))))
+        (mapcan (lambda (dep)
+                  (destructuring-bind (op name) dep
+                    (output-files (make-instance op)
+                                  (find-component parent name))))
+                self-deps)
+        ;; no previous operations needed?  I guess we work with the
+        ;; original source file, then
+        (list (component-pathname c)))))
 
 (defmethod input-files ((operation operation) (c module)) nil)
 
 (defmethod operation-done-p ((o operation) (c component))
   (let ((out-files (output-files o c))
-	(in-files (input-files o c)))
+        (in-files (input-files o c)))
     (cond ((and (not in-files) (not out-files))
-	   ;; arbitrary decision: an operation that uses nothing to
-	   ;; produce nothing probably isn't doing much 
-	   t)
-	  ((not out-files) 
-	   (let ((op-done
-		  (gethash (type-of o)
-			   (component-operation-times c))))
-	     (and op-done
-		  (>= op-done
-		      (or (apply #'max
-				 (mapcar #'file-write-date in-files)) 0)))))
-	  ((not in-files) nil)
-	  (t
-	   (and
-	    (every #'probe-file out-files)
-	    (> (apply #'min (mapcar #'file-write-date out-files))
-	       (apply #'max (mapcar #'file-write-date in-files)) ))))))
+           ;; arbitrary decision: an operation that uses nothing to
+           ;; produce nothing probably isn't doing much
+           t)
+          ((not out-files)
+           (let ((op-done
+                  (gethash (type-of o)
+                           (component-operation-times c))))
+             (and op-done
+                  (>= op-done
+                      (or (apply #'max
+                                 (mapcar #'file-write-date in-files)) 0)))))
+          ((not in-files) nil)
+          (t
+           (and
+            (every #'probe-file out-files)
+            (> (apply #'min (mapcar #'file-write-date out-files))
+               (apply #'max (mapcar #'file-write-date in-files)) ))))))
 
 ;;; So you look at this code and think "why isn't it a bunch of
 ;;; methods".  And the answer is, because standard method combination
@@ -596,81 +596,81 @@
 (defmethod traverse ((operation operation) (c component))
   (let ((forced nil))
     (labels ((do-one-dep (required-op required-c required-v)
-	       (let* ((dep-c (or (find-component
-				  (component-parent c)
-				  ;; XXX tacky.  really we should build the
-				  ;; in-order-to slot with canonicalized
-				  ;; names instead of coercing this late
-				  (coerce-name required-c) required-v)
-				 (error 'missing-dependency :required-by c
-					:version required-v
-					:requires required-c)))
-		      (op (make-sub-operation c operation dep-c required-op)))
-		 (traverse op dep-c)))	   	   
-	     (do-dep (op dep)
-	       (cond ((eq op 'feature)
-		      (or (member (car dep) *features*)
-			  (error 'missing-dependency :required-by c
-				 :requires (car dep) :version nil)))
-		     (t
-		      (dolist (d dep)
+               (let* ((dep-c (or (find-component
+                                  (component-parent c)
+                                  ;; XXX tacky.  really we should build the
+                                  ;; in-order-to slot with canonicalized
+                                  ;; names instead of coercing this late
+                                  (coerce-name required-c) required-v)
+                                 (error 'missing-dependency :required-by c
+                                        :version required-v
+                                        :requires required-c)))
+                      (op (make-sub-operation c operation dep-c required-op)))
+                 (traverse op dep-c)))
+             (do-dep (op dep)
+               (cond ((eq op 'feature)
+                      (or (member (car dep) *features*)
+                          (error 'missing-dependency :required-by c
+                                 :requires (car dep) :version nil)))
+                     (t
+                      (dolist (d dep)
                         (cond ((consp d)
                                (assert (string-equal
                                         (symbol-name (first d))
                                         "VERSION"))
                                (appendf forced
-					(do-one-dep op (second d) (third d))))
+                                        (do-one-dep op (second d) (third d))))
                               (t
                                (appendf forced (do-one-dep op d nil)))))))))
       (aif (component-visited-p operation c)
-	   (return-from traverse
-	     (if (cdr it) (list (cons 'pruned-op c)) nil)))
+           (return-from traverse
+             (if (cdr it) (list (cons 'pruned-op c)) nil)))
       ;; dependencies
       (if (component-visiting-p operation c)
-	  (error 'circular-dependency :components (list c)))
+          (error 'circular-dependency :components (list c)))
       (setf (visiting-component operation c) t)
       (loop for (required-op . deps) in (component-depends-on operation c)
-	    do (do-dep required-op deps))
+            do (do-dep required-op deps))
       ;; constituent bits
       (let ((module-ops
-	     (when (typep c 'module)
-	       (let ((at-least-one nil)
-		     (forced nil)
-		     (error nil))
-		 (loop for kid in (module-components c)
-		       do (handler-case
-			      (appendf forced (traverse operation kid ))
-			    (missing-dependency (condition)
-			      (if (eq (module-if-component-dep-fails c) :fail)
-				  (error condition))
-			      (setf error condition))
-			    (:no-error (c)
-			      (declare (ignore c))
-			      (setf at-least-one t))))
-		 (when (and (eq (module-if-component-dep-fails c) :try-next)
-			    (not at-least-one))
-		   (error error))
-		 forced))))
-	;; now the thing itself
-	(when (or forced module-ops
-		  (not (operation-done-p operation c))
-		  (let ((f (operation-forced (operation-ancestor operation))))
-		    (and f (or (not (consp f))
-			       (member (component-name
-					(operation-ancestor operation))
-				       (mapcar #'coerce-name f)
-				       :test #'string=)))))
-	  (let ((do-first (cdr (assoc (class-name (class-of operation))
-				      (slot-value c 'do-first)))))
-	    (loop for (required-op . deps) in do-first
-		  do (do-dep required-op deps)))
-	  (setf forced (append (delete 'pruned-op forced :key #'car)
-			       (delete 'pruned-op module-ops :key #'car)
-			       (list (cons operation c))))))
+             (when (typep c 'module)
+               (let ((at-least-one nil)
+                     (forced nil)
+                     (error nil))
+                 (loop for kid in (module-components c)
+                       do (handler-case
+                              (appendf forced (traverse operation kid ))
+                            (missing-dependency (condition)
+                              (if (eq (module-if-component-dep-fails c) :fail)
+                                  (error condition))
+                              (setf error condition))
+                            (:no-error (c)
+                              (declare (ignore c))
+                              (setf at-least-one t))))
+                 (when (and (eq (module-if-component-dep-fails c) :try-next)
+                            (not at-least-one))
+                   (error error))
+                 forced))))
+        ;; now the thing itself
+        (when (or forced module-ops
+                  (not (operation-done-p operation c))
+                  (let ((f (operation-forced (operation-ancestor operation))))
+                    (and f (or (not (consp f))
+                               (member (component-name
+                                        (operation-ancestor operation))
+                                       (mapcar #'coerce-name f)
+                                       :test #'string=)))))
+          (let ((do-first (cdr (assoc (class-name (class-of operation))
+                                      (slot-value c 'do-first)))))
+            (loop for (required-op . deps) in do-first
+                  do (do-dep required-op deps)))
+          (setf forced (append (delete 'pruned-op forced :key #'car)
+                               (delete 'pruned-op module-ops :key #'car)
+                               (list (cons operation c))))))
       (setf (visiting-component operation c) nil)
       (visit-component operation c (and forced t))
       forced)))
-  
+
 
 (defmethod perform ((operation operation) (c source-file))
   (sysdef-error
@@ -689,43 +689,43 @@
 (defclass compile-op (operation)
   ((proclamations :initarg :proclamations :accessor compile-op-proclamations :initform nil)
    (on-warnings :initarg :on-warnings :accessor operation-on-warnings
-		:initform *compile-file-warnings-behaviour*)
+                :initform *compile-file-warnings-behaviour*)
    (on-failure :initarg :on-failure :accessor operation-on-failure
-	       :initform *compile-file-failure-behaviour*)))
+               :initform *compile-file-failure-behaviour*)))
 
 (defmethod perform :before ((operation compile-op) (c source-file))
   (map nil #'ensure-directories-exist (output-files operation c)))
 
 (defmethod perform :after ((operation operation) (c component))
   (setf (gethash (type-of operation) (component-operation-times c))
-	(get-universal-time)))
+        (get-universal-time)))
 
 ;;; perform is required to check output-files to find out where to put
 ;;; its answers, in case it has been overridden for site policy
 (defmethod perform ((operation compile-op) (c cl-source-file))
   #-:broken-fasl-loader
   (let ((source-file (component-pathname c))
-	(output-file (car (output-files operation c))))
+        (output-file (car (output-files operation c))))
     (multiple-value-bind (output warnings-p failure-p)
-	(compile-file source-file
-		      :output-file output-file)
+        (compile-file source-file
+                      :output-file output-file)
       ;(declare (ignore output))
       (when warnings-p
-	(case (operation-on-warnings operation)
-	  (:warn (warn
-		  "~@<COMPILE-FILE warned while performing ~A on ~A.~@:>"
-		  operation c))
-	  (:error (error 'compile-warned :component c :operation operation))
-	  (:ignore nil)))
+        (case (operation-on-warnings operation)
+          (:warn (warn
+                  "~@<COMPILE-FILE warned while performing ~A on ~A.~@:>"
+                  operation c))
+          (:error (error 'compile-warned :component c :operation operation))
+          (:ignore nil)))
       (when failure-p
-	(case (operation-on-failure operation)
-	  (:warn (warn
-		  "~@<COMPILE-FILE failed while performing ~A on ~A.~@:>"
-		  operation c))
-	  (:error (error 'compile-failed :component c :operation operation))
-	  (:ignore nil)))
+        (case (operation-on-failure operation)
+          (:warn (warn
+                  "~@<COMPILE-FILE failed while performing ~A on ~A.~@:>"
+                  operation c))
+          (:error (error 'compile-failed :component c :operation operation))
+          (:ignore nil)))
       (unless output
-	(error 'compile-error :component c :operation operation)))))
+        (error 'compile-error :component c :operation operation)))))
 
 (defmethod output-files ((operation compile-op) (c cl-source-file))
   #-:broken-fasl-loader (list (compile-file-pathname (component-pathname c)))
@@ -784,8 +784,8 @@
 
 (defmethod operation-done-p ((o load-source-op) (c source-file))
   (if (or (not (component-property c 'last-loaded-as-source))
-	  (> (file-write-date (component-pathname c))
-	     (component-property c 'last-loaded-as-source)))
+          (> (file-write-date (component-pathname c))
+             (component-property c 'last-loaded-as-source)))
       nil t))
 
 (defclass test-op (operation) ())
@@ -798,35 +798,35 @@
 
 (defun operate (operation-class system &rest args)
   (let* ((op (apply #'make-instance operation-class
-		    :original-initargs args args))
-	 (*verbose-out*
-	  (if (getf args :verbose t)
-	      *trace-output*
-	      (make-broadcast-stream)))
-	 (system (if (typep system 'component) system (find-system system)))
-	 (steps (traverse op system)))
+                    :original-initargs args args))
+         (*verbose-out*
+          (if (getf args :verbose t)
+              *trace-output*
+              (make-broadcast-stream)))
+         (system (if (typep system 'component) system (find-system system)))
+         (steps (traverse op system)))
     (with-compilation-unit ()
       (loop for (op . component) in steps do
-	    (loop
-	     (restart-case 
-		 (progn (perform op component)
-			(return))
-	       (retry ()
-		 :report
-		 (lambda (s)
-		   (format s "~@<Retry performing ~S on ~S.~@:>"
-			   op component)))
-	       (accept ()
-		 :report
-		 (lambda (s)
-		   (format s
-			   "~@<Continue, treating ~S on ~S as ~
+            (loop
+             (restart-case
+                 (progn (perform op component)
+                        (return))
+               (retry ()
+                 :report
+                 (lambda (s)
+                   (format s "~@<Retry performing ~S on ~S.~@:>"
+                           op component)))
+               (accept ()
+                 :report
+                 (lambda (s)
+                   (format s
+                           "~@<Continue, treating ~S on ~S as ~
                             having been successful.~@:>"
-			   op component))
-		 (setf (gethash (type-of op)
-				(component-operation-times component))
-		       (get-universal-time))
-		 (return))))))))
+                           op component))
+                 (setf (gethash (type-of op)
+                                (component-operation-times component))
+                       (get-universal-time))
+                 (return))))))))
 
 (defun oos (&rest args)
   "Alias of OPERATE function"
@@ -837,169 +837,169 @@
 
 (defun remove-keyword (key arglist)
   (labels ((aux (key arglist)
-	     (cond ((null arglist) nil)
-		   ((eq key (car arglist)) (cddr arglist))
-		   (t (cons (car arglist) (cons (cadr arglist)
-						(remove-keyword
-						 key (cddr arglist))))))))
+             (cond ((null arglist) nil)
+                   ((eq key (car arglist)) (cddr arglist))
+                   (t (cons (car arglist) (cons (cadr arglist)
+                                                (remove-keyword
+                                                 key (cddr arglist))))))))
     (aux key arglist)))
 
 (defmacro defsystem (name &body options)
   (destructuring-bind (&key pathname (class 'system) &allow-other-keys) options
     (let ((component-options (remove-keyword :class options)))
       `(progn
-	;; system must be registered before we parse the body, otherwise
-	;; we recur when trying to find an existing system of the same name
-	;; to reuse options (e.g. pathname) from
-	(let ((s (system-registered-p ',name)))
-	  (cond ((and s (eq (type-of (cdr s)) ',class))
-		 (setf (car s) (get-universal-time)))
-		(s
-		 #+clisp
-		 (sysdef-error "Cannot redefine the existing system ~A with a different class" s)
-		 #-clisp
-		 (change-class (cdr s) ',class))
-		(t
-		 (register-system (quote ,name)
-				  (make-instance ',class :name ',name)))))
-	(parse-component-form nil (apply
-				   #'list
-				   :module (coerce-name ',name)
-				   :pathname
-				   (or ,pathname
-				       (pathname-sans-name+type
-					(resolve-symlinks  *load-truename*))
-				       *default-pathname-defaults*)
-				   ',component-options))))))
-  
+        ;; system must be registered before we parse the body, otherwise
+        ;; we recur when trying to find an existing system of the same name
+        ;; to reuse options (e.g. pathname) from
+        (let ((s (system-registered-p ',name)))
+          (cond ((and s (eq (type-of (cdr s)) ',class))
+                 (setf (car s) (get-universal-time)))
+                (s
+                 #+clisp
+                 (sysdef-error "Cannot redefine the existing system ~A with a different class" s)
+                 #-clisp
+                 (change-class (cdr s) ',class))
+                (t
+                 (register-system (quote ,name)
+                                  (make-instance ',class :name ',name)))))
+        (parse-component-form nil (apply
+                                   #'list
+                                   :module (coerce-name ',name)
+                                   :pathname
+                                   (or ,pathname
+                                       (pathname-sans-name+type
+                                        (resolve-symlinks  *load-truename*))
+                                       *default-pathname-defaults*)
+                                   ',component-options))))))
+
 
 (defun class-for-type (parent type)
-  (let ((class 
-	 (find-class
-	  (or (find-symbol (symbol-name type) *package*)
-	      (find-symbol (symbol-name type) #.(package-name *package*)))
-	  nil)))
+  (let ((class
+         (find-class
+          (or (find-symbol (symbol-name type) *package*)
+              (find-symbol (symbol-name type) #.(package-name *package*)))
+          nil)))
     (or class
-	(and (eq type :file)
-	     (or (module-default-component-class parent)
-		 (find-class 'cl-source-file)))
-	(sysdef-error "~@<don't recognize component type ~A~@:>" type))))
+        (and (eq type :file)
+             (or (module-default-component-class parent)
+                 (find-class 'cl-source-file)))
+        (sysdef-error "~@<don't recognize component type ~A~@:>" type))))
 
 (defun maybe-add-tree (tree op1 op2 c)
   "Add the node C at /OP1/OP2 in TREE, unless it's there already.
 Returns the new tree (which probably shares structure with the old one)"
   (let ((first-op-tree (assoc op1 tree)))
     (if first-op-tree
-	(progn
-	  (aif (assoc op2 (cdr first-op-tree))
-	       (if (find c (cdr it))
-		   nil
-		   (setf (cdr it) (cons c (cdr it))))
-	       (setf (cdr first-op-tree)
-		     (acons op2 (list c) (cdr first-op-tree))))
-	  tree)
-	(acons op1 (list (list op2 c)) tree))))
-		
+        (progn
+          (aif (assoc op2 (cdr first-op-tree))
+               (if (find c (cdr it))
+                   nil
+                   (setf (cdr it) (cons c (cdr it))))
+               (setf (cdr first-op-tree)
+                     (acons op2 (list c) (cdr first-op-tree))))
+          tree)
+        (acons op1 (list (list op2 c)) tree))))
+
 (defun union-of-dependencies (&rest deps)
   (let ((new-tree nil))
     (dolist (dep deps)
       (dolist (op-tree dep)
-	(dolist (op  (cdr op-tree))
-	  (dolist (c (cdr op))
-	    (setf new-tree
-		  (maybe-add-tree new-tree (car op-tree) (car op) c))))))
+        (dolist (op  (cdr op-tree))
+          (dolist (c (cdr op))
+            (setf new-tree
+                  (maybe-add-tree new-tree (car op-tree) (car op) c))))))
     new-tree))
 
 
 (defun remove-keys (key-names args)
   (loop for ( name val ) on args by #'cddr
-	unless (member (symbol-name name) key-names 
-		       :key #'symbol-name :test 'equal)
-	append (list name val)))
+        unless (member (symbol-name name) key-names
+                       :key #'symbol-name :test 'equal)
+        append (list name val)))
 
 (defvar *serial-depends-on*)
 
 (defun parse-component-form (parent options)
   (destructuring-bind
-	(type name &rest rest &key
-	      ;; the following list of keywords is reproduced below in the
-	      ;; remove-keys form.  important to keep them in sync
-	      components pathname default-component-class
-	      perform explain output-files operation-done-p
-	      depends-on serial in-order-to
-	      ;; list ends
-	      &allow-other-keys) options
+        (type name &rest rest &key
+              ;; the following list of keywords is reproduced below in the
+              ;; remove-keys form.  important to keep them in sync
+              components pathname default-component-class
+              perform explain output-files operation-done-p
+              depends-on serial in-order-to
+              ;; list ends
+              &allow-other-keys) options
     (check-component-input type name depends-on components in-order-to)
     (let* ((other-args (remove-keys
-			'(components pathname default-component-class
-			  perform explain output-files operation-done-p
-			  depends-on serial in-order-to)
-			rest))
-	   (ret
-	    (or (find-component parent name)
-		(make-instance (class-for-type parent type)))))
+                        '(components pathname default-component-class
+                          perform explain output-files operation-done-p
+                          depends-on serial in-order-to)
+                        rest))
+           (ret
+            (or (find-component parent name)
+                (make-instance (class-for-type parent type)))))
       (when (boundp '*serial-depends-on*)
-	(setf depends-on
-	      (concatenate 'list *serial-depends-on* depends-on)))
+        (setf depends-on
+              (concatenate 'list *serial-depends-on* depends-on)))
       (apply #'reinitialize-instance
-	     ret
-	     :name (coerce-name name)
-	     :pathname pathname
-	     :parent parent
-	     other-args)
+             ret
+             :name (coerce-name name)
+             :pathname pathname
+             :parent parent
+             other-args)
       (when (typep ret 'module)
-	(setf (module-default-component-class ret)
-	      (or default-component-class
-		  (and (typep parent 'module)
-		       (module-default-component-class parent))))
-	(let ((*serial-depends-on* nil))
-	  (setf (module-components ret)
-		(loop for c-form in components
-		      for c = (parse-component-form ret c-form)
-		      collect c
-		      if serial
-		      do (push (component-name c) *serial-depends-on*)))))
-      
+        (setf (module-default-component-class ret)
+              (or default-component-class
+                  (and (typep parent 'module)
+                       (module-default-component-class parent))))
+        (let ((*serial-depends-on* nil))
+          (setf (module-components ret)
+                (loop for c-form in components
+                      for c = (parse-component-form ret c-form)
+                      collect c
+                      if serial
+                      do (push (component-name c) *serial-depends-on*)))))
+
       (setf (slot-value ret 'in-order-to)
-	    (union-of-dependencies
-	     in-order-to
-	     `((compile-op (compile-op ,@depends-on))
-	       (load-op (load-op ,@depends-on))))
-	    (slot-value ret 'do-first) `((compile-op (load-op ,@depends-on))))
-      
+            (union-of-dependencies
+             in-order-to
+             `((compile-op (compile-op ,@depends-on))
+               (load-op (load-op ,@depends-on))))
+            (slot-value ret 'do-first) `((compile-op (load-op ,@depends-on))))
+
       (loop for (n v) in `((perform ,perform) (explain ,explain)
-			   (output-files ,output-files)
-			   (operation-done-p ,operation-done-p))
-	    do (map 'nil
-		    ;; this is inefficient as most of the stored
-		    ;; methods will not be for this particular gf n
-		    ;; But this is hardly performance-critical
-		    (lambda (m) (remove-method (symbol-function n) m))
-		    (component-inline-methods ret))
-	    when v
-	    do (destructuring-bind (op qual (o c) &body body) v
-		 (pushnew
-		  (eval `(defmethod ,n ,qual ((,o ,op) (,c (eql ,ret)))
-			  ,@body))
-		  (component-inline-methods ret))))
+                           (output-files ,output-files)
+                           (operation-done-p ,operation-done-p))
+            do (map 'nil
+                    ;; this is inefficient as most of the stored
+                    ;; methods will not be for this particular gf n
+                    ;; But this is hardly performance-critical
+                    (lambda (m) (remove-method (symbol-function n) m))
+                    (component-inline-methods ret))
+            when v
+            do (destructuring-bind (op qual (o c) &body body) v
+                 (pushnew
+                  (eval `(defmethod ,n ,qual ((,o ,op) (,c (eql ,ret)))
+                          ,@body))
+                  (component-inline-methods ret))))
       ret)))
 
 (defun check-component-input (type name depends-on components in-order-to)
   "A partial test of the values of a component."
   (unless (listp depends-on)
     (sysdef-error-component ":depends-on must be a list."
-			    type name depends-on))
+                            type name depends-on))
   (unless (listp components)
     (sysdef-error-component ":components must be NIL or a list of components."
-			    type name components))
+                            type name components))
   (unless (and (listp in-order-to) (listp (car in-order-to)))
     (sysdef-error-component ":in-order-to must be NIL or a list of components."
-			   type name in-order-to)))
+                           type name in-order-to)))
 
 (defun sysdef-error-component (msg type name value)
   (sysdef-error (concatenate 'string msg
-			     "~&The value specified for ~(~A~) ~A is ~W")
-		type name value))
+                             "~&The value specified for ~(~A~) ~A is ~W")
+                type name value))
 
 (defun resolve-symlinks (path)
   #-allegro (truename path)
@@ -1020,36 +1020,36 @@
     (format *verbose-out* "; $ ~A~%" command)
     #+sbcl
     (sb-impl::process-exit-code
-     (sb-ext:run-program  
+     (sb-ext:run-program
       "/bin/sh"
       (list  "-c" command)
       :input nil :output *verbose-out*))
-    
+
     #+(or cmu scl)
     (ext:process-exit-code
-     (ext:run-program  
+     (ext:run-program
       "/bin/sh"
       (list  "-c" command)
       :input nil :output *verbose-out*))
 
     #+allegro
     (excl:run-shell-command command :input nil :output *verbose-out*)
-    
+
     #+lispworks
     (system:call-system-showing-output
      command
      :shell-type "/bin/sh"
      :output-stream *verbose-out*)
-    
-    #+clisp				;XXX not exactly *verbose-out*, I know
+
+    #+clisp                             ;XXX not exactly *verbose-out*, I know
     (ext:run-shell-command  command :output :terminal :wait t)
 
     #+openmcl
     (nth-value 1
-	       (ccl:external-process-status
-		(ccl:run-program "/bin/sh" (list "-c" command)
-				 :input nil :output *verbose-out*
-				 :wait t)))
+               (ccl:external-process-status
+                (ccl:run-program "/bin/sh" (list "-c" command)
+                                 :input nil :output *verbose-out*
+                                 :wait t)))
     #+ecl ;; courtesy of Juan Jose Garcia Ripoll
     (si:system command)
     #-(or openmcl clisp lispworks allegro scl cmu sbcl ecl)
@@ -1077,26 +1077,26 @@
   (defun module-provide-asdf (name)
     (handler-bind ((style-warning #'muffle-warning))
       (let* ((*verbose-out* (make-broadcast-stream))
-	     (system (asdf:find-system name nil)))
-	(when system
-	  (asdf:operate 'asdf:load-op name)
-	  t))))
+             (system (asdf:find-system name nil)))
+        (when system
+          (asdf:operate 'asdf:load-op name)
+          t))))
 
   (pushnew
    '(merge-pathnames "systems/"
      (truename (sb-ext:posix-getenv "SBCL_HOME")))
    *central-registry*)
-  
+
   (pushnew
    '(merge-pathnames "site-systems/"
      (truename (sb-ext:posix-getenv "SBCL_HOME")))
    *central-registry*)
-  
+
   (pushnew
    '(merge-pathnames ".sbcl/systems/"
      (user-homedir-pathname))
    *central-registry*)
-  
+
   (pushnew 'module-provide-asdf sb-ext:*module-provider-functions*))
 
 (provide 'asdf)