Commit 33a2560f authored by Francois-Rene Rideau's avatar Francois-Rene Rideau
Browse files

Fix footer for MKCL and ECL. 

Make sure we use the correct package for *load-hooks* on MKCL,
and on both implementations (and CLASP), use ensure-gethash correctly
by wrapping the default in a constantly since it is a function.
parent 10b0a6d3

footer.lisp

+7 −4
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
  #+(or abcl clasp cmucl clozure ecl mkcl sbcl)

  (:import-from #+abcl :sys #+(or clasp cmucl ecl) :ext #+clozure :ccl #+mkcl :mk-ext #+sbcl sb-ext

		#:*module-provider-functions*

		#+(or clasp ecl mkcl) #:*load-hooks*)

		#+(or clasp ecl) #:*load-hooks*)

  #+mkcl (:import-from :si #:*load-hooks*))



(in-package :asdf/footer)
@@ -36,10 +36,13 @@ 
      (let ((results (multiple-value-list (funcall provider name))))

	(when (first results) (register-preloaded-system (coerce-name name)))

	(values-list results)))

    (setf *module-provider-functions*

          (loop :for provider :in *module-provider-functions* :collect

    (defun wrap-module-provider-function (provider)

      (ensure-gethash provider *wrapped-module-provider*

			    #'(lambda (module-name) (wrap-module-provider provider module-name)))))))

		      (constantly

		       #'(lambda (module-name)

			   (wrap-module-provider provider module-name)))))

    (setf *module-provider-functions*

	  (mapcar #'wrap-module-provider-function *module-provider-functions*))))



#+cmucl ;; Hook into the CMUCL herald.

(with-upgradability ()

test/test-utilities.script

+1 −0
Original line number Diff line number Diff line
@@ -456,6 +456,7 @@ 
  (assert-equal (multiple-value-list (ensure-gethash 1 h 3)) '(2 t))

  (assert-equal (multiple-value-list (ensure-gethash 1 h '(error "foo"))) '(2 t))

  (signals parse-error (ensure-gethash 2 h '(error parse-error)))

  (assert-equal (multiple-value-list (ensure-gethash 2 h (lambda () 5))) '(5 nil))

  (assert-equal (multiple-value-list (gethash 3 h nil)) '(nil nil))

  (assert-equal (multiple-value-list (ensure-gethash 3 h nil)) '(nil nil))

  (assert-equal (multiple-value-list (gethash 3 h 4)) '(nil t))