GitLab

at 2024-07-14T12:34:05+00:00

Fix #333: LOAD :IF-DOES-NOT-EXIST is a generalized boolean

Merge branch 'issue-333-load-if-does-not-exist' into 'master'

Fix #333: LOAD :IF-DOES-NOT-EXIST is a generalized boolean

Closes #333

See merge request cmucl/cmucl!231
 		   (fasload filename)

 		   (sloload filename))

 	       (let ((pn (merge-pathnames (pathname filename)

-					  *default-pathname-defaults* nil)))

+					  *default-pathname-defaults* nil))

+                     (if-does-not-exist (if if-does-not-exist :error nil)))

 		 (if (wild-pathname-p pn)

 		     (dolist (file (directory pn) t)

 		       (internal-load pn file if-does-not-exist contents

 

 (defknown load

   ((or filename stream)

-   &key (:verbose t) (:print t) (:if-does-not-exist (member :error nil))

+   &key (:verbose t) (:print t) (:if-does-not-exist t)

    (:if-source-newer (member :load-source :load-object :query :compile))

    (:contents (or null (member :source :binary)))

    (:external-format t))

 	   (not (zerop n))))

     (dolist (x '(0 1 1000))

       (assert-equal (expected x) (fun x) x))))

+

+(define-test issue.333.if-does-not-exist

+    (:tag :issues)

+  ;; "unknown.lisp" should be a file that doesn't exist.  Verify that

+  ;; if :IF-DOES-NOT-EXIST is non-NIL we signal an error from LOAD.

+  ;; The first case is the old default value of :ERROR.

+  (assert-error 'file-error

+                 (load "unknown.lisp" :if-does-not-exist :error))

+  ;; :IF-DOES-NOT-EXIST is a generalized BOOLEAN, so non-NIL will

+  ;; signal an error too.

+  (assert-error 'file-error

+                 (load "unknown.lisp" :if-does-not-exist t))

+  (assert-false (load "unknown.lisp" :if-does-not-exist nil)))

Raymond Toy pushed to branch master at cmucl / cmucl

Commits:

3 changed files:

Changes: