mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-26 05:00:28 +02:00
Code Activity

* boot-9.scm (try-load-module): New procedure. Broken out from

Browse source 
resolve-module.
(resolve-module): Bugfix: Make it possible for a module at a
deeper level (x y z) to depend on a module on a higher (x y).
Use try-load-module.
This commit is contained in:
Mikael Djurfeldt 1999-03-19 05:14:09 +00:00
parent 7e68f4482b
commit 432558b9b5
1 changed files with 18 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

22
ice-9/boot-9.scm
View file

@ -1910,17 +1910,31 @@
;; (define-special-value '(app modules new-ws) (lambda () (make-scm-module)))
(define (try-load-module name)
(or (try-module-linked name)
(try-module-autoload name)
(try-module-dynamic-link name)))
;; NOTE: This binding is used in libguile/modules.c.
;;
(define (resolve-module name . maybe-autoload)
(let ((full-name (append '(app modules) name)))
(let ((already (local-ref full-name)))
(or already
(if already
;; The module already exists...
(if (and (or (null? maybe-autoload) (car maybe-autoload))
(not (module-ref already '%module-public-interface #f)))
;; ...but we are told to load and it doesn't contain source, so
(begin
(try-load-module name)
already)
;; simply return it.
already)
(begin
;; Try to autoload it if we are told so
(if (or (null? maybe-autoload) (car maybe-autoload))
(or (try-module-linked name)
(try-module-autoload name)
(try-module-dynamic-link name)))
(try-load-module name))
;; Get/create it.
(make-modules-in (current-module) full-name))))))
(define (beautify-user-module! module)