Skip to content

Commit 4727689

Browse files
committed
Revert d148f2d
Using wild-inferiors to search all subdirectories is too slow.
1 parent 4524578 commit 4727689

File tree

3 files changed

+8
-19
lines changed

3 files changed

+8
-19
lines changed

quicklisp/dist.lisp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -497,9 +497,7 @@
497497
(defun dist-name-pathname (name)
498498
"Return the pathname that would be used for an installed dist with
499499
the given NAME."
500-
(qmerge (make-pathname :directory (list* :relative
501-
"dists"
502-
(split-slashes name)))))
500+
(qmerge (make-pathname :directory (list :relative "dists" name))))
503501

504502
(defmethod slot-unbound (class (dist dist) (slot (eql 'base-directory)))
505503
(declare (ignore class))
@@ -579,7 +577,7 @@ the given NAME."
579577

580578
(defun standard-dist-enumeration-function ()
581579
"The default function used for producing a list of dist objects."
582-
(loop for file in (directory (qmerge "dists/**/distinfo.txt"))
580+
(loop for file in (directory (qmerge "dists/*/distinfo.txt"))
583581
collect (make-dist-from-file file)))
584582

585583
(defun all-dists ()

quicklisp/package.lisp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
#:delete-file-if-exists
1313
#:ensure-file-exists
1414
#:split-spaces
15-
#:split-slashes
1615
#:first-line
1716
#:file-size
1817
#:safely-read

quicklisp/utils.lisp

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -56,31 +56,29 @@
5656
(when (probe-file pathname)
5757
(delete-file pathname)))
5858

59-
(defun split (line delimiter)
59+
(defun split-spaces (line)
6060
(let ((words '())
6161
(mark 0)
6262
(pos 0))
6363
(labels ((finish ()
6464
(setf pos (length line))
6565
(save)
66-
(return-from split (nreverse words)))
66+
(return-from split-spaces (nreverse words)))
6767
(save ()
6868
(when (< mark pos)
6969
(push (subseq line mark pos) words)))
7070
(mark ()
7171
(setf mark pos))
7272
(in-word (char)
73-
(cond
74-
((char= char
75-
delimiter)
73+
(case char
74+
(#\Space
7675
(save)
7776
#'in-space)
7877
(t
7978
#'in-word)))
8079
(in-space (char)
81-
(cond
82-
((char= char
83-
delimiter)
80+
(case char
81+
(#\Space
8482
#'in-space)
8583
(t
8684
(mark)
@@ -90,12 +88,6 @@
9088
(setf pos i)
9189
(setf state (funcall state (char line i))))))))
9290

93-
(defun split-spaces (line)
94-
(split line #\Space))
95-
96-
(defun split-slashes (line)
97-
(split line #\/))
98-
9991
(defun first-line (file)
10092
(with-open-file (stream file)
10193
(values (read-line stream))))

0 commit comments

Comments
 (0)