guile/guile-core/ice-9 ChangeLog boot-9.scm

[Mikael Djurfeldt]

CVSROOT:        /cvs
Module name:    guile
Branch:         branch_release-1-6
Changes by:     Mikael Djurfeldt <address@hidden>       01/09/24 07:13:43

Modified files:
        guile-core/ice-9: ChangeLog boot-9.scm 

Log message:
        * boot-9.scm (process-define-module): Added :re-export.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-core/ice-9/ChangeLog.diff?cvsroot=OldCVS&only_with_tag=branch_release-1-6&tr1=1.461.2.16&tr2=1.461.2.17&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-core/ice-9/boot-9.scm.diff?cvsroot=OldCVS&only_with_tag=branch_release-1-6&tr1=1.266.2.5&tr2=1.266.2.6&r1=text&r2=text

Patches:
Index: guile/guile-core/ice-9/ChangeLog
diff -u guile/guile-core/ice-9/ChangeLog:1.482 
guile/guile-core/ice-9/ChangeLog:1.483
--- guile/guile-core/ice-9/ChangeLog:1.482      Wed Sep 19 09:04:22 2001
+++ guile/guile-core/ice-9/ChangeLog    Mon Sep 24 07:12:22 2001
@@ -1,3 +1,7 @@
+2001-09-24  Mikael Djurfeldt  <address@hidden>
+
+       * boot-9.scm (process-define-module): Added :re-export.
+
 2001-09-19  Thien-Thi Nguyen  <address@hidden>
 
        * expect.scm: Commentary fix; nfc.
Index: guile/guile-core/ice-9/boot-9.scm
diff -u guile/guile-core/ice-9/boot-9.scm:1.273 
guile/guile-core/ice-9/boot-9.scm:1.274
--- guile/guile-core/ice-9/boot-9.scm:1.273     Wed Sep 19 08:56:28 2001
+++ guile/guile-core/ice-9/boot-9.scm   Mon Sep 24 07:12:23 2001
@@ -1705,13 +1705,15 @@
     (beautify-user-module! module)
     (let loop ((kws kws)
               (reversed-interfaces '())
-              (exports '()))
+              (exports '())
+              (re-exports '()))
       (if (null? kws)
          (begin
            (for-each (lambda (interface)
                        (module-use! module interface))
                      (reverse reversed-interfaces))
-           (module-export! module exports))
+           (module-export! module exports)
+           (module-re-export! module re-exports))
          (case (car kws)
            ((#:use-module #:use-syntax)
             (or (pair? (cdr kws))
@@ -1729,7 +1731,8 @@
                                 #f)))
               (loop (cddr kws)
                     (cons interface reversed-interfaces)
-                    exports)))
+                    exports
+                    re-exports)))
            ((#:autoload)
             (or (and (pair? (cdr kws)) (pair? (cddr kws)))
                 (unrecognized kws))
@@ -1738,19 +1741,28 @@
                                                  (cadr kws)
                                                  (caddr kws))
                         reversed-interfaces)
-                  exports))
+                  exports
+                  re-exports))
            ((#:no-backtrace)
             (set-system-module! module #t)
-            (loop (cdr kws) reversed-interfaces exports))
+            (loop (cdr kws) reversed-interfaces exports re-exports))
            ((#:pure)
             (purify-module! module)
-            (loop (cdr kws) reversed-interfaces exports))
+            (loop (cdr kws) reversed-interfaces exports re-exports))
            ((#:export)
             (or (pair? (cdr kws))
                 (unrecognized kws))
             (loop (cddr kws)
                   reversed-interfaces
-                  (append (cadr kws) exports)))
+                  (append (cadr kws) exports)
+                  re-exports))
+           ((#:re-export)
+            (or (pair? (cdr kws))
+                (unrecognized kws))
+            (loop (cddr kws)
+                  reversed-interfaces
+                  exports
+                  (append (cadr kws) re-exports)))
            (else
             (unrecognized kws)))))
     module))