fix macros that expand into (begin (define-module ...) ...)

* module/ice-9/boot-9.scm (define-module): Add `expand' to the
  situations, so that we ensure the current module changes at expand
  time.

* module/ice-9/r6rs-libraries.scm (library): Expand the body within @@
  expressions.

diff --git a/module/ice-9/boot-9.scm b/module/ice-9/boot-9.scm
index c1a9447..794e929 100644 (file)
--- a/module/ice-9/boot-9.scm
+++ b/module/ice-9/boot-9.scm
@@ -3326,7 +3326,7 @@ module '(ice-9 q) '(make-q q-length))}."
     (syntax-case x ()
       ((_ (name name* ...) arg ...)
        (with-syntax (((quoted-arg ...) (quotify #'(arg ...))))
-         #'(eval-when (eval load compile)
+         #'(eval-when (eval load compile expand)
              (let ((m (process-define-module
                        (list '(name name* ...) quoted-arg ...))))
                (set-current-module m)

diff --git a/module/ice-9/r6rs-libraries.scm b/module/ice-9/r6rs-libraries.scm
index dc77ee6..14c89d0 100644 (file)
--- a/module/ice-9/r6rs-libraries.scm
+++ b/module/ice-9/r6rs-libraries.scm
@@ -178,7 +178,8 @@
                  ...
                  (re-export r ...)
                  (export e ...)
-                 body ...))))))))
+                 (@@ (name name* ...) body)
+                 ...))))))))
     
 (define-syntax import
   (lambda (stx)