fix some uses of %module-public-interface

* module/ice-9/r5rs.scm:
* module/ice-9/safe-r5rs.scm:
* module/oop/goops/save.scm:
* module/oop/goops/simple.scm:
* module/oop/goops/stklos.scm: Fix some uses of
  %module-public-interface.

5 files changed, 17 insertions, 12 deletions

diff --git a/module/ice-9/r5rs.scm b/module/ice-9/r5rs.scm
index c867f9a3c..6432bbc7b 100644
--- a/module/ice-9/r5rs.scm
+++ b/module/ice-9/r5rs.scm
@@ -1,4 +1,4 @@
-;;;; 	Copyright (C) 2000, 2001, 2006 Free Software Foundation, Inc.
+;;;; 	Copyright (C) 2000, 2001, 2006, 2010 Free Software Foundation, Inc.
 ;;;; 
 ;;;; This library is free software; you can redistribute it and/or
 ;;;; modify it under the terms of the GNU Lesser General Public
@@ -31,9 +31,10 @@
 
 	      load))  
 
-(module-use! %module-public-interface (resolve-interface '(ice-9 safe-r5rs)))
+(module-use! (module-public-interface (current-module))
+             (resolve-interface '(ice-9 safe-r5rs)))
 
-(define scheme-report-interface %module-public-interface)
+(define scheme-report-interface (module-public-interface (current-module)))
 
 (define (scheme-report-environment n)
   (if (not (= n 5))
diff --git a/module/ice-9/safe-r5rs.scm b/module/ice-9/safe-r5rs.scm
index f728533cb..a7ab164fa 100644
--- a/module/ice-9/safe-r5rs.scm
+++ b/module/ice-9/safe-r5rs.scm
@@ -1,4 +1,4 @@
-;;;; 	Copyright (C) 2000, 2001, 2004, 2006 Free Software Foundation, Inc.
+;;;; 	Copyright (C) 2000, 2001, 2004, 2006, 2010 Free Software Foundation, Inc.
 ;;;; 
 ;;;; This library is free software; you can redistribute it and/or
 ;;;; modify it under the terms of the GNU Lesser General Public
@@ -129,7 +129,8 @@
 
 (define null-interface (resolve-interface '(ice-9 null)))
 
-(module-use! %module-public-interface null-interface)
+(module-use! (module-public-interface (current-module))
+             null-interface)
 
 (define (null-environment n)
   (if (not (= n 5))
diff --git a/module/oop/goops/save.scm b/module/oop/goops/save.scm
index b51c9e31f..70d8a131c 100644
--- a/module/oop/goops/save.scm
+++ b/module/oop/goops/save.scm
@@ -1,6 +1,6 @@
 ;;; installed-scm-file
 
-;;;; Copyright (C) 2000,2001,2002, 2006, 2009 Free Software Foundation, Inc.
+;;;; Copyright (C) 2000,2001,2002, 2006, 2009, 2010 Free Software Foundation, Inc.
 ;;;; 
 ;;;; This library is free software; you can redistribute it and/or
 ;;;; modify it under the terms of the GNU Lesser General Public
@@ -848,10 +848,12 @@
     (close-port port)
     objects))
 
+(define iface (module-public-interface (current-module)))
+
 (define-method (load-objects (file <input-port>))
   (let ((m (make-module)))
     (module-use! m the-scm-module)
-    (module-use! m %module-public-interface)
+    (module-use! m iface)
     (save-module-excursion
      (lambda ()
        (set-current-module m)
diff --git a/module/oop/goops/simple.scm b/module/oop/goops/simple.scm
index bc5405a8d..8f4d839c1 100644
--- a/module/oop/goops/simple.scm
+++ b/module/oop/goops/simple.scm
@@ -1,6 +1,6 @@
 ;;; installed-scm-file
 
-;;;; Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+;;;; Copyright (C) 2005, 2006, 2010 Free Software Foundation, Inc.
 ;;;; 
 ;;;; This library is free software; you can redistribute it and/or
 ;;;; modify it under the terms of the GNU Lesser General Public
@@ -28,4 +28,5 @@
     ((_ arg ...)
      (define-class-with-accessors-keywords arg ...))))
 
-(module-use! %module-public-interface (resolve-interface '(oop goops)))
+(module-use! (module-public-interface (current-module))
+             (resolve-interface '(oop goops)))
diff --git a/module/oop/goops/stklos.scm b/module/oop/goops/stklos.scm
index 718635e4d..8a7ae1636 100644
--- a/module/oop/goops/stklos.scm
+++ b/module/oop/goops/stklos.scm
@@ -34,9 +34,9 @@
 
 ;; Export all bindings that are exported from (oop goops)...
 (module-for-each (lambda (sym var)
-		   (module-add! %module-public-interface sym var))
-		 (nested-ref the-root-module '(%app modules oop goops
-						   %module-public-interface)))
+		   (module-add! (module-public-interface (current-module))
+                                sym var))
+		 (resolve-interface '(oop goops)))
 
 ;; ...but replace the following bindings:
 (export define-class define-method)