mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-05-30 00:40:20 +02:00
* boot-9.scm (try-module-autoload): Use %search-load-path.
This commit is contained in:
parent
c5b738b500
commit
defed51763
1 changed files with 6 additions and 26 deletions
|
@ -2010,32 +2010,12 @@
|
|||
(let ((didit #f))
|
||||
(dynamic-wind
|
||||
(lambda () (autoload-in-progress! dir-hint name))
|
||||
(lambda ()
|
||||
(let loop ((dirs %load-path))
|
||||
(and (not (null? dirs))
|
||||
(or
|
||||
(let ((d (car dirs))
|
||||
(trys (list
|
||||
dir-hint
|
||||
(sfx dir-hint)
|
||||
(in-vicinity dir-hint name)
|
||||
(in-vicinity dir-hint (sfx name)))))
|
||||
(and (or-map (lambda (f)
|
||||
(let ((full (in-vicinity d f)))
|
||||
full
|
||||
(and (file-exists? full)
|
||||
(not (file-is-directory? full))
|
||||
(begin
|
||||
(save-module-excursion
|
||||
(lambda ()
|
||||
(load (string-append
|
||||
d "/" f))))
|
||||
#t))))
|
||||
trys)
|
||||
(begin
|
||||
(set! didit #t)
|
||||
#t)))
|
||||
(loop (cdr dirs))))))
|
||||
(lambda ()
|
||||
(let ((full (%search-load-path (in-vicinity dir-hint name))))
|
||||
(if full
|
||||
(begin
|
||||
(save-module-excursion (lambda () (primitive-load full)))
|
||||
(set! didit #t)))))
|
||||
(lambda () (set-autoloaded! dir-hint name didit)))
|
||||
didit))))
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue