1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-10 14:00:21 +02:00

* boot-9.scm (try-module-linked): Try to find module among those already

registered.
(try-module-dynamic-link): Removed the first test which
corresponds to a call to `try-module-linked'.
(resolve-module): Resolve modules in this order: 1. Already
registered modules (for example those which have been statically
linked), 2. Try to autoload an .scm-file, 3. Try to dynamically
link a .so-file.
This commit is contained in:
Mikael Djurfeldt 1997-09-16 21:31:19 +00:00
parent 0a54457d78
commit a4f9b1f613
2 changed files with 16 additions and 5 deletions

View file

@ -5,6 +5,14 @@ Tue Sep 16 22:09:50 1997 Mikael Djurfeldt <mdj@mdj.nada.kth.se>
(separate-fields-discarding-char, separate-fields-after-char,
separate-fields-before-char): Bugfix from Maciej Stachowiak
<mstachow@mit.edu>. Thanks!
(try-module-linked): Try to find module among those already
registered.
(try-module-dynamic-link): Removed the first test which
corresponds to a call to `try-module-linked'.
(resolve-module): Resolve modules in this order: 1. Already
registered modules (for example those which have been statically
linked), 2. Try to autoload an .scm-file, 3. Try to dynamically
link a .so-file.
Mon Sep 15 23:39:54 1997 Mikael Djurfeldt <mdj@mdj.nada.kth.se>

View file

@ -1830,7 +1830,8 @@
(or already
(begin
(if (or (null? maybe-autoload) (car maybe-autoload))
(or (try-module-autoload name)
(or (try-module-linked name)
(try-module-autoload name)
(try-module-dynamic-link name)))
(make-modules-in (current-module) full-name))))))
@ -2080,11 +2081,13 @@
(set! registered-modules
(append! (convert-c-registered-modules dynobj)
registered-modules))))
(define (try-module-linked module-name)
(init-dynamic-module module-name))
(define (try-module-dynamic-link module-name)
(or (init-dynamic-module module-name)
(and (find-and-link-dynamic-module module-name)
(init-dynamic-module module-name))))
(and (find-and-link-dynamic-module module-name)
(init-dynamic-module module-name)))