GitLab

at 2023-04-30T13:54:45+00:00

Fix #193: Treat NIL and :UNSPECIFIC as equivalent in pathnames

Merge branch 'issue-193-nil-unspecific-equivalent' into 'master'

Fix #193: Treat NIL and :UNSPECIFIC as equivalent in pathnames

Closes #193

See merge request cmucl/cmucl!144
 	(cons

 	 (and (consp that)

 	      (compare-component (car this) (car that))

-	      (compare-component (cdr this) (cdr that)))))))

+	      (compare-component (cdr this) (cdr that))))

+	(symbol

+	 ;; Handle NIL and :UNSPECIFIC as being equivalent

+	 (or (and (eq this :unspecific)

+		  (null that))

+	     (and (null this)

+		  (eq that :unspecific)))))))

 ;; Compare the version component.  We treat NIL to be EQUAL to

-;; :NEWEST.

+;; :NEWEST or :UNSPECIFIC.

 (defun compare-version-component (this that)

   (or (eql this that)

-      (and (null this) (eq that :newest))

-      (and (null that) (eq this :newest))))

+      (if (and (member this '(nil :newest :unspecific) :test #'eq)

+	       (member that '(nil :newest :unspecific) :test #'eq))

+	  t

+	  nil)))

 ;;;; Pathname functions.

     (assert-true (typep idf-max-expo 'kernel:double-float-int-exponent))

     (assert-true (typep (1- idf-max-expo) 'kernel:double-float-int-exponent))

     (assert-false (typep (1+ idf-max-expo) 'kernel:double-float-int-exponent))))

+

+(define-test issue.192.device

+  (assert-true (equal (make-pathname :device :unspecific)

+		      (make-pathname :device nil)))

+  (assert-true (equal (make-pathname :device nil)

+		      (make-pathname :device :unspecific))))

+

+(define-test issue.192.name

+  (assert-true (equal (make-pathname :name :unspecific)

+		      (make-pathname :name nil)))

+  (assert-true (equal (make-pathname :name nil)

+		      (make-pathname :name :unspecific))))

+

+(define-test issue.192.type

+  (assert-true (equal (make-pathname :type :unspecific)

+		      (make-pathname :type nil)))

+  (assert-true (equal (make-pathname :type nil)

+		      (make-pathname :type :unspecific))))

+

+(define-test issue.192.version

+  (assert-true (equal (make-pathname :version :newest)

+		      (make-pathname :version nil)))

+  (assert-true (equal (make-pathname :version nil)

+		      (make-pathname :version :newest)))

+  (assert-true (equal (make-pathname :version :unspecific)

+		      (make-pathname :version nil)))

+  (assert-true (equal (make-pathname :version nil)

+		      (make-pathname :version :unspecific)))

+  (assert-true (equal (make-pathname :version :unspecific)

+		      (make-pathname :version :newest)))

+  (assert-true (equal (make-pathname :version :newest)

+		      (make-pathname :version :unspecific)))

+)

Raymond Toy pushed to branch master at cmucl / cmucl

Commits:

2 changed files:

Changes: