Merge pull request quicklisp#206 from svetlyak40wt/support-slash-in-dist-name

Now QL supports distributions with slash in their names

Author: quicklisp

quicklisp/dist.lisp

@@ -497,7 +497,9 @@
 (defun dist-name-pathname (name)
   "Return the pathname that would be used for an installed dist with
 the given NAME."
-  (qmerge (make-pathname :directory (list :relative "dists" name))))
+  (qmerge (make-pathname :directory (list* :relative
+                                           "dists"
+                                           (split-slashes name)))))
 
 (defmethod slot-unbound (class (dist dist) (slot (eql 'base-directory)))
   (declare (ignore class))
@@ -577,7 +579,7 @@ the given NAME."
 
 (defun standard-dist-enumeration-function ()
   "The default function used for producing a list of dist objects."
-  (loop for file in (directory (qmerge "dists/*/distinfo.txt"))
+  (loop for file in (directory (qmerge "dists/**/distinfo.txt"))
         collect (make-dist-from-file file)))
 
 (defun all-dists ()

quicklisp/package.lisp

@@ -12,6 +12,7 @@
            #:delete-file-if-exists
            #:ensure-file-exists
            #:split-spaces
+           #:split-slashes
            #:first-line
            #:file-size
            #:safely-read

quicklisp/utils.lisp

@@ -56,29 +56,31 @@
   (when (probe-file pathname)
     (delete-file pathname)))
 
-(defun split-spaces (line)
+(defun split (line delimiter)
   (let ((words '())
         (mark 0)
         (pos 0))
     (labels ((finish ()
                (setf pos (length line))
                (save)
-               (return-from split-spaces (nreverse words)))
+               (return-from split (nreverse words)))
              (save ()
                (when (< mark pos)
                  (push (subseq line mark pos) words)))
              (mark ()
                (setf mark pos))
              (in-word (char)
-               (case char
-                 (#\Space
+               (cond
+                 ((char= char
+                         delimiter)
                     (save)
                     #'in-space)
                  (t
                     #'in-word)))
              (in-space (char)
-               (case char
-                 (#\Space
+               (cond
+                 ((char= char
+                         delimiter)
                     #'in-space)
                  (t
                     (mark)
@@ -88,6 +90,12 @@
           (setf pos i)
           (setf state (funcall state (char line i))))))))
 
+(defun split-spaces (line)
+  (split line #\Space))
+
+(defun split-slashes (line)
+  (split line #\/))
+
 (defun first-line (file)
   (with-open-file (stream file)
     (values (read-line stream))))