Commit 0e27f08f authored by Francois-Rene Rideau's avatar Francois-Rene Rideau
Browse files

Let mark-component-preloaded accept any component designator.

Also remove an extraneous assertion.
parent b12a48c5
...@@ -212,10 +212,9 @@ the implementation's REQUIRE rather than by internal ASDF mechanisms.")) ...@@ -212,10 +212,9 @@ the implementation's REQUIRE rather than by internal ASDF mechanisms."))
;; but must check whether we can use find-system and short-circuit cl:require. ;; but must check whether we can use find-system and short-circuit cl:require.
;; Otherwise, calling cl:require could result in nasty reentrant calls between ;; Otherwise, calling cl:require could result in nasty reentrant calls between
;; cl:require and asdf:operate that could potentially blow up the stack. ;; cl:require and asdf:operate that could potentially blow up the stack.
(let* ((module (car arguments)) (let* ((module (car arguments)) ;; NB: we already checked that it was not null
(name (string-downcase module)) (name (string-downcase module))
(system (find-system name nil))) (system (find-system name nil)))
(assert module)
(or system (let ((system (make-instance 'require-system :name name))) (or system (let ((system (make-instance 'require-system :name name)))
(register-system system) (register-system system)
system)))) system))))
...@@ -259,10 +258,11 @@ the implementation's REQUIRE rather than by internal ASDF mechanisms.")) ...@@ -259,10 +258,11 @@ the implementation's REQUIRE rather than by internal ASDF mechanisms."))
;; It is defined here to resolve what would otherwise be forward package references. ;; It is defined here to resolve what would otherwise be forward package references.
(defun mark-component-preloaded (component) (defun mark-component-preloaded (component)
"Mark a component as preloaded." "Mark a component as preloaded."
;; Recurse to children, so asdf/plan will hopefully be happy. (let ((component (find-component component nil :registered t)))
(map () 'mark-component-preloaded (component-children component)) ;; Recurse to children, so asdf/plan will hopefully be happy.
;; Mark the timestamps of the common lisp-action operations as 0. (map () 'mark-component-preloaded (component-children component))
(let ((times (component-operation-times component))) ;; Mark the timestamps of the common lisp-action operations as 0.
(dolist (o '(load-op compile-op prepare-op)) (let ((times (component-operation-times component)))
(setf (gethash o times) 0))))) (dolist (o '(load-op compile-op prepare-op))
(setf (gethash o times) 0))))))
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