mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-06-21 11:10:21 +02:00
* boot-9.scm (process-define-module): Reverted the change of
1998-11-23 which caused loading of object code if :use-module was applied to the module itself.
This commit is contained in:
parent
9705d5c2a1
commit
45a02a29a6
2 changed files with 22 additions and 22 deletions
|
@ -1,3 +1,9 @@
|
||||||
|
1998-12-14 Mikael Djurfeldt <mdj@mdj.nada.kth.se>
|
||||||
|
|
||||||
|
* boot-9.scm (process-define-module): Reverted the change of
|
||||||
|
1998-11-23 which caused loading of object code if :use-module was
|
||||||
|
applied to the module itself.
|
||||||
|
|
||||||
1998-12-11 Mikael Djurfeldt <mdj@barbara.nada.kth.se>
|
1998-12-11 Mikael Djurfeldt <mdj@barbara.nada.kth.se>
|
||||||
|
|
||||||
* Makefile.am: Removed setf.scm.
|
* Makefile.am: Removed setf.scm.
|
||||||
|
|
|
@ -1966,29 +1966,23 @@
|
||||||
(error "unrecognized defmodule argument" kws))
|
(error "unrecognized defmodule argument" kws))
|
||||||
(let* ((used-name (cadr kws))
|
(let* ((used-name (cadr kws))
|
||||||
(used-module (resolve-module used-name)))
|
(used-module (resolve-module used-name)))
|
||||||
(if (eq? used-module module)
|
(if (not (module-ref used-module
|
||||||
|
'%module-public-interface
|
||||||
|
#f))
|
||||||
(begin
|
(begin
|
||||||
(or (try-module-linked used-name)
|
((if %autoloader-developer-mode warn error)
|
||||||
(try-module-dynamic-link used-name))
|
"no code for module" (module-name used-module))
|
||||||
(loop (cddr kws) reversed-interfaces))
|
(beautify-user-module! used-module)))
|
||||||
(begin
|
(let ((interface (module-public-interface used-module)))
|
||||||
(if (not (module-ref used-module
|
(if (not interface)
|
||||||
'%module-public-interface
|
(error "missing interface for use-module"
|
||||||
#f))
|
used-module))
|
||||||
(begin
|
(if (eq? keyword 'use-syntax)
|
||||||
((if %autoloader-developer-mode warn error)
|
(internal-use-syntax
|
||||||
"no code for module" (module-name used-module))
|
(module-ref interface (car (last-pair used-name))
|
||||||
(beautify-user-module! used-module)))
|
#f)))
|
||||||
(let ((interface (module-public-interface used-module)))
|
(loop (cddr kws)
|
||||||
(if (not interface)
|
(cons interface reversed-interfaces)))))
|
||||||
(error "missing interface for use-module"
|
|
||||||
used-module))
|
|
||||||
(if (eq? keyword 'use-syntax)
|
|
||||||
(internal-use-syntax
|
|
||||||
(module-ref interface (car (last-pair used-name))
|
|
||||||
#f)))
|
|
||||||
(loop (cddr kws)
|
|
||||||
(cons interface reversed-interfaces)))))))
|
|
||||||
((autoload)
|
((autoload)
|
||||||
(if (not (and (pair? (cdr kws)) (pair? (cddr kws))))
|
(if (not (and (pair? (cdr kws)) (pair? (cddr kws))))
|
||||||
(error "unrecognized defmodule argument" kws))
|
(error "unrecognized defmodule argument" kws))
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue