dmbcs/guile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use the define-module variants in module-name and make-modules-in

Browse source 
* module/ice-9/boot-9.scm (module-name): Use module-define-submodule!
  instead of nested-define!.
  (make-modules-in): Rewrite in terms of nested-define-module!.
This commit is contained in:
Andy Wingo 2010-04-23 15:44:31 +02:00
commit 9e0bfdbaa3
1 changed files with 7 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2267,24 +2267,16 @@ If there is no handler at all, Guile prints an error and then exits."
;; `resolve-module'. This is important as `psyntax' stores module
;; names and relies on being able to `resolve-module' them.
(set-module-name! mod name)
(nested-define! (resolve-module '() #f) name mod)
(nested-define-module! (resolve-module '() #f) name mod)
(accessor mod))))))
(define (make-modules-in module name)
(if (null? name)
module
(make-modules-in
(let* ((var (module-local-variable module (car name)))
(val (and var (variable-bound? var) (variable-ref var))))
(if (module? val)
val
(let ((m (make-module 31)))
(set-module-kind! m 'directory)
(set-module-name! m (append (module-name module)
(list (car name))))
(module-define! module (car name) m)
m)))
(cdr name))))
(or (nested-ref-module module name)
(let ((m (make-module 31)))
(set-module-kind! m 'directory)
(set-module-name! m (append (module-name module) name))
(nested-define-module! module name m)
m)))
(define (beautify-user-module! module)
(let ((interface (module-public-interface module)))