diff --git a/component.lisp b/component.lisp index 854b63ddf308f6e5b127d32760e0c2a4bb6a11ad..ac1c206dc7c12588c7dd0f25b8229c36396fdb76 100644 --- a/component.lisp +++ b/component.lisp @@ -34,11 +34,9 @@ ;; Internals we'd like to share with the ASDF package, especially for upgrade purposes #:name #:version #:description #:long-description #:author #:maintainer #:licence - #:components-by-name #:components - #:children #:children-by-name #:default-component-class - #:author #:maintainer #:licence #:source-file - ;; the following retained for backward compatibility. - #:defsystem-depends-on + #:components-by-name #:components #:children #:children-by-name + #:default-component-class #:source-file + #:defsystem-depends-on ; This symbol retained for backward compatibility. #:sideway-dependencies #:if-feature #:in-order-to #:inline-methods #:relative-pathname #:absolute-pathname #:operation-times #:around-compile #:%encoding #:properties #:component-properties #:parent)) diff --git a/parse-defsystem.lisp b/parse-defsystem.lisp index 403067156d3ac2763b7507d1456f8527fc26fc22..80c11415e0a2c7f27998da33cd24e2c744101b32 100644 --- a/parse-defsystem.lisp +++ b/parse-defsystem.lisp @@ -170,8 +170,8 @@ (apply 'reinitialize-instance component args) (setf component (apply 'make-instance class args))) (component-pathname component) ; eagerly compute the absolute pathname - ;; cache information for introspection (when (typep component 'system) + ;; cache information for introspection (setf (slot-value component 'depends-on) depends-on (slot-value component 'weakly-depends-on) weakly-depends-on)) (let ((sysfile (system-source-file (component-system component)))) ;; requires the previous diff --git a/system.lisp b/system.lisp index 9e46bca13aed80c7a249ba30d9f66d418e3d6c36..4cd735410aa81d48281f9e172ad9c0c7242bb11a 100644 --- a/system.lisp +++ b/system.lisp @@ -66,8 +66,7 @@ :initform nil) ;; these two are specially set in parse-component-form, so have no :INITARGs. (depends-on :reader system-depends-on :initform nil) - (weakly-depends-on :reader system-weakly-depends-on :initform nil) - )) + (weakly-depends-on :reader system-weakly-depends-on :initform nil))) (defun reset-system (system &rest keys &key &allow-other-keys) (change-class (change-class system 'proto-system) 'system) diff --git a/test/script-support.lisp b/test/script-support.lisp index c798af6cb6ebf4ffb872d49e5c259d9095bf629f..45b94a3aeefd0e4c67718f9997a837eaa57defa2 100644 --- a/test/script-support.lisp +++ b/test/script-support.lisp @@ -345,8 +345,7 @@ is bound, write a message and exit on an error. If (funcall thunk)) #+allegro (excl:without-redefinition-warnings - (funcall thunk)) - ) + (funcall thunk))) (defun interactive-test (&optional files) (verbose t nil) diff --git a/test/test-utilities.script b/test/test-utilities.script index 38415b9f6e9ce84ac4ab1947a26e63cedad87144..4b01d4c377619fac7d60271365601605dc54bcbb 100644 --- a/test/test-utilities.script +++ b/test/test-utilities.script @@ -95,7 +95,7 @@ asdf/component:default-component-class ;; the following is here only for backward compatibility; should be in ;; asdf/system. [2014/02/20:rpg] - asdf/component:defsystem-depends-on + asdf/component:defsystem-depends-on asdf/component:description asdf/component:%encoding asdf/component:if-feature