mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-09 15:10:29 +02:00
Code Activity

Resolve issues in `find-versioned-module'.

Browse source 
* module/ice-9/boot-9.scm (find-versioned-module): Perform a stable sort on
  version numbers of matched libraries; eliminate extra path separator in
  library file path.
This commit is contained in:
Julian Graham 2010-06-09 23:57:00 -04:00
parent 162125af16
commit dc232ed059
1 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
module/ice-9/boot-9.scm
View file

@ -2346,7 +2346,7 @@ If there is no handler at all, Guile prints an error and then exits."
(cond ((> (car lst1) (car lst2)) #t) (cond ((> (car lst1) (car lst2)) #t)
((< (car lst1) (car lst2)) #f) ((< (car lst1) (car lst2)) #f)
(else (numlist-less (cdr lst1) (cdr lst2))))))) (else (numlist-less (cdr lst1) (cdr lst2)))))))
(numlist-less (car pair1) (car pair2))) (not (numlist-less (car pair2) (car pair1))))
(define (match-version-and-file pair) (define (match-version-and-file pair)
(and (version-matches? version-ref (car pair)) (and (version-matches? version-ref (car pair))
(let ((filenames (let ((filenames
@ -2354,7 +2354,7 @@ If there is no handler at all, Guile prints an error and then exits."
(let ((s (false-if-exception (stat file)))) (let ((s (false-if-exception (stat file))))
(and s (eq? (stat:type s) 'regular)))) (and s (eq? (stat:type s) 'regular))))
(map (lambda (ext) (map (lambda (ext)
(string-append (cdr pair) "/" name ext)) (string-append (cdr pair) name ext))
%load-extensions)))) %load-extensions))))
(and (not (null? filenames)) (and (not (null? filenames))
(cons (car pair) (car filenames)))))) (cons (car pair) (car filenames))))))
@ -2365,12 +2365,14 @@ If there is no handler at all, Guile prints an error and then exits."
(let ((entry (readdir dstrm))) (let ((entry (readdir dstrm)))
(if (eof-object? entry) (if (eof-object? entry)
subdir-pairs subdir-pairs
(let* ((subdir (string-append (cdr root-pair) "/" entry)) (let* ((subdir (string-append (cdr root-pair) entry))
(num (string->number entry)) (num (string->number entry))
(num (and num (append (car root-pair) (list num))))) (num (and num (exact? num) (append (car root-pair)
(list num)))))
(if (and num (eq? (stat:type (stat subdir)) 'directory)) (if (and num (eq? (stat:type (stat subdir)) 'directory))
(filter-subdir (filter-subdir
root-pair dstrm (cons (cons num subdir) subdir-pairs)) root-pair dstrm (cons (cons num (string-append subdir "/"))
subdir-pairs))
(filter-subdir root-pair dstrm subdir-pairs)))))) (filter-subdir root-pair dstrm subdir-pairs))))))
(or (and (null? root-pairs) ret) (or (and (null? root-pairs) ret)