From 0e27f08fd4f836d75e24f406d60a6a04fa80137c Mon Sep 17 00:00:00 2001 From: Francois-Rene Rideau <fare@tunes.org> Date: Thu, 15 Sep 2016 20:47:59 -0400 Subject: [PATCH] Let mark-component-preloaded accept any component designator. Also remove an extraneous assertion. --- operate.lisp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/operate.lisp b/operate.lisp index 7d9dbb92c..af0a836ce 100644 --- a/operate.lisp +++ b/operate.lisp @@ -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. ;; Otherwise, calling cl:require could result in nasty reentrant calls between ;; 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)) (system (find-system name nil))) - (assert module) (or system (let ((system (make-instance 'require-system :name name))) (register-system system) system)))) @@ -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. (defun mark-component-preloaded (component) "Mark a component as preloaded." - ;; Recurse to children, so asdf/plan will hopefully be happy. - (map () 'mark-component-preloaded (component-children component)) - ;; Mark the timestamps of the common lisp-action operations as 0. - (let ((times (component-operation-times component))) - (dolist (o '(load-op compile-op prepare-op)) - (setf (gethash o times) 0))))) + (let ((component (find-component component nil :registered t))) + ;; Recurse to children, so asdf/plan will hopefully be happy. + (map () 'mark-component-preloaded (component-children component)) + ;; Mark the timestamps of the common lisp-action operations as 0. + (let ((times (component-operation-times component))) + (dolist (o '(load-op compile-op prepare-op)) + (setf (gethash o times) 0)))))) -- GitLab