mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-06-12 23:00:22 +02:00
define* in load-module
* module/ice-9/boot-9.scm (load-module): Use define*.
This commit is contained in:
parent
723ae5b370
commit
5a6621244f
1 changed files with 8 additions and 9 deletions
|
@ -1987,19 +1987,18 @@ If there is no handler at all, Guile prints an error and then exits."
|
||||||
|
|
||||||
(define basic-load load)
|
(define basic-load load)
|
||||||
|
|
||||||
(define (load-module filename . reader)
|
(define* (load-module filename #:optional reader)
|
||||||
(save-module-excursion
|
(save-module-excursion
|
||||||
(lambda ()
|
(lambda ()
|
||||||
(let ((oldname (and (current-load-port)
|
(let ((oldname (and (current-load-port)
|
||||||
(port-filename (current-load-port)))))
|
(port-filename (current-load-port)))))
|
||||||
(apply basic-load
|
(basic-load (if (and oldname
|
||||||
(if (and oldname
|
(> (string-length filename) 0)
|
||||||
(> (string-length filename) 0)
|
(not (char=? (string-ref filename 0) #\/))
|
||||||
(not (char=? (string-ref filename 0) #\/))
|
(not (string=? (dirname oldname) ".")))
|
||||||
(not (string=? (dirname oldname) ".")))
|
(string-append (dirname oldname) "/" filename)
|
||||||
(string-append (dirname oldname) "/" filename)
|
filename)
|
||||||
filename)
|
reader)))))
|
||||||
reader)))))
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue