* 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.

diff --git a/ice-9/ChangeLog b/ice-9/ChangeLog
index b3689c5..1b7034d 100644 (file)
--- a/ice-9/ChangeLog
+++ b/ice-9/ChangeLog
@@ -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>
 
        * Makefile.am: Removed setf.scm.

diff --git a/ice-9/boot-9.scm b/ice-9/boot-9.scm
index 4737b5c..f8c1d8d 100644 (file)
--- a/ice-9/boot-9.scm
+++ b/ice-9/boot-9.scm
@@ -1966,29 +1966,23 @@
                   (error "unrecognized defmodule argument" kws))
               (let* ((used-name (cadr kws))
                      (used-module (resolve-module used-name)))
-                (if (eq? used-module module)
+                (if (not (module-ref used-module
+                                     '%module-public-interface
+                                     #f))
                     (begin
-                      (or (try-module-linked used-name)
-                          (try-module-dynamic-link used-name))
-                      (loop (cddr kws) reversed-interfaces))
-                    (begin
-                      (if (not (module-ref used-module
-                                           '%module-public-interface
-                                           #f))
-                          (begin
-                            ((if %autoloader-developer-mode warn error)
-                             "no code for module" (module-name used-module))
-                            (beautify-user-module! used-module)))
-                      (let ((interface (module-public-interface used-module)))
-                        (if (not interface)
-                            (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)))))))
+                      ((if %autoloader-developer-mode warn error)
+                       "no code for module" (module-name used-module))
+                      (beautify-user-module! used-module)))
+                (let ((interface (module-public-interface used-module)))
+                  (if (not interface)
+                      (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)
               (if (not (and (pair? (cdr kws)) (pair? (cddr kws))))
                   (error "unrecognized defmodule argument" kws))