Raymond Toy pushed to branch master at cmucl / cmucl

Commits:

• b3de9354
  by Raymond Toy at 2023-03-09T14:46:48+00:00

  Fix #157: (directory "**/") only returns directories
  

• 39e30fad
  by Raymond Toy at 2023-03-09T14:46:48+00:00

  Merge branch 'issue-157-directory-no-magic-wildcarding' into 'master'
  
  Fix #157: (directory "**/") only returns directories
  
  Closes #157
  
  See merge request cmucl/cmucl!127

2 changed files:

• src/code/filesys.lisp
• tests/pathname.lisp

Changes:

     (let ((results nil))

       (enumerate-search-list

 	  (pathname (merge-pathnames pathname

-				     (make-pathname :name :wild

-						    :type :wild

-						    :version :wild

-						    :defaults *default-pathname-defaults*)

-				     :wild))

+				     *default-pathname-defaults*))

 	(enumerate-matches (name pathname nil :follow-links follow-links)

 	  (when (or all

 		    (let ((slash (position #\/ name :from-end t)))

 			       :directory '(:absolute "system2" "module4")

 			       :name nil :type nil)

 		(parse-namestring "ASDFTEST:system2;module4;"))))

-  

+

+

+

+(define-test directory.dirs

+  (let ((files (directory "src/assembly/**/")))

+    ;; Verify that we only returned directories

+    (loop for f in files

+	  for name = (pathname-name f)

+	  and type = (pathname-type f)

+	  do

+	     (assert-true (and (null name) (null type)) f))))