Commit fb6ce7e6 by Robert Goldman

Removed convenience methods on %ADDITIONAL-INPUT-FILES.

Removed the convenience functions and revised the funcall that made them
necessary.
Also tweaked some comments.
parent e68eb145
......@@ -384,7 +384,9 @@ They may rely on the order of the files to discriminate between inputs.
(defgeneric additional-input-files (operation component)
(:documentation "Additional input files for the operation on this
component. These are files that are inferred, rather than
explicitly specified."))
explicitly specified, and these are typically NOT files that
undergo operations directly. Instead, they are files that it is
important for ASDF to know about in order to compute operation times,etc."))
(define-convenience-action-methods additional-input-files (operation component))
(defmethod additional-input-files ((op operation) (comp component))
(cdr (assoc op (%additional-input-files comp))))
......
......@@ -139,9 +139,7 @@ or NIL for top-level components (a.k.a. systems)"))
(parent :initarg :parent :initform nil :reader component-parent)
(build-operation
:initarg :build-operation :initform nil :reader component-build-operation)
;; input files that are inferred instead of being specified.
;; Currently this is used only to track files from READ-FILE-FORM
;; and READ-FILE-LINE.
;; Cache for ADDITIONAL-INPUT-FILES function.
(additional-input-files :accessor %additional-input-files :initform nil))
(:documentation "Base class for all components of a build"))
......
......@@ -293,15 +293,3 @@ PREVIOUS-TIME when not null is the time at which the PREVIOUS system was loaded.
(dolist (o `(,@(when (primary-system-p component) '(define-op))
prepare-op compile-op load-op))
(setf (gethash (make-operation o) cot) 0))))))
;;; additional methods for %additional-input-files that are
;;; responsible for looking up systems.
(with-upgradability ()
(defmethod %additional-input-files ((comp symbol))
(%additional-input-files (find-system comp)))
(defmethod %additional-input-files ((comp string))
(%additional-input-files (find-system comp)))
(defmethod (setf %additional-input-files) (val (comp symbol))
(setf (%additional-input-files (find-system comp)) val))
(defmethod (setf %additional-input-files) (val (comp string))
(setf (%additional-input-files (find-system comp)) val)))
......@@ -115,10 +115,14 @@ Please only define ~S and secondary systems with a name starting with ~S (e.g. ~
:do (setf retval par)
:finally (return retval))
component))
(comp (if (typep record-on 'component)
record-on
;; at this point there will be no parent for RECORD-ON
(find-component record-on nil)))
(op (make-operation 'define-op))
(cell (or (assoc op (%additional-input-files record-on))
(cell (or (assoc op (%additional-input-files comp))
(let ((new-cell (list op)))
(push new-cell (%additional-input-files record-on))
(push new-cell (%additional-input-files comp))
new-cell))))
(pushnew pathname (cdr cell) :test 'pathname-equal)
(values)))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment