guile/guile-core/oop/goops active-slot.scm comp...

[Mikael Djurfeldt]

CVSROOT:        /cvs
Module name:    guile
Changes by:     Mikael Djurfeldt <address@hidden>       01/10/21 05:48:23

Modified files:
        guile-core/oop/goops: active-slot.scm compile.scm 
                              composite-slot.scm describe.scm 
                              dispatch.scm old-define-method.scm 
                              save.scm util.scm 

Log message:
        * lib.scm: Move module the system directives `export',
        `export-syntax', `re-export' and `re-export-syntax' into the
        `define-module' form.  This is the recommended way of exporting
        bindings.
        
        * srfi-2.scm, srfi-4.scm, srfi-8.scm, srfi-9.scm, srfi-10.scm,
        srfi-11.scm, srfi-14.scm, srfi-16.scm: Move module the system
        directives `export', `export-syntax', `re-export' and
        `re-export-syntax' into the `define-module' form.  This is the
        recommended way of exporting bindings.
        
        * goops.scm, goops/active-slot.scm, goops/compile.scm,
        goops/composite-slot.scm, goops/describe.scm, goops/dispatch.scm,
        goops/old-define-method.scm, goops/save.scm, goops/util.scm: Move
        module the system directives `export', `export-syntax',
        `re-export' and `re-export-syntax' into the `define-module' form.
        This is the recommended way of exporting bindings.
        
        * slib.scm (array-indexes): New procedure.
        (*features*): Extend.  (Probably some of these options should be
        set elsewhere.)  (Thanks to Aubrey Jaffer.)
        
        * and-let-star-compat.scm, and-let-star.scm, calling.scm,
        channel.scm, common-list.scm, debug.scm, debugger.scm,
        expect.scm, hcons.scm, lineio.scm, ls.scm, mapping.scm,
        null.scm, optargs.scm, poe.scm, popen.scm, pretty-print.scm,
        q.scm, r5rs.scm, rdelim.scm, regex.scm, runq.scm, safe-r5rs.scm,
        safe.scm, session.scm, slib.scm, streams.scm, string-fun.scm,
        syncase.scm, threads.scm: Move module the system directives
        `export', `export-syntax', `re-export' and `re-export-syntax'
        into the `define-module' form.  This is the recommended way of
        exporting bindings.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-core/oop/goops/active-slot.scm.diff?cvsroot=OldCVS&tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-core/oop/goops/compile.scm.diff?cvsroot=OldCVS&tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-core/oop/goops/composite-slot.scm.diff?cvsroot=OldCVS&tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-core/oop/goops/describe.scm.diff?cvsroot=OldCVS&tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-core/oop/goops/dispatch.scm.diff?cvsroot=OldCVS&tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-core/oop/goops/old-define-method.scm.diff?cvsroot=OldCVS&tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-core/oop/goops/save.scm.diff?cvsroot=OldCVS&tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-core/oop/goops/util.scm.diff?cvsroot=OldCVS&tr1=1.4&tr2=1.5&r1=text&r2=text

Patches:
Index: guile/guile-core/oop/goops/active-slot.scm
diff -u guile/guile-core/oop/goops/active-slot.scm:1.3 
guile/guile-core/oop/goops/active-slot.scm:1.4
--- guile/guile-core/oop/goops/active-slot.scm:1.3      Sun Jun  3 19:32:27 2001
+++ guile/guile-core/oop/goops/active-slot.scm  Sun Oct 21 05:48:23 2001
@@ -51,9 +51,8 @@
 ;;;;
 
 (define-module (oop goops active-slot)
-  :use-module (oop goops internal))
-
-(export <active-class>)
+  :use-module (oop goops internal)
+  :export (<active-class>))
 
 (define-class <active-class> (<class>))
 
Index: guile/guile-core/oop/goops/compile.scm
diff -u guile/guile-core/oop/goops/compile.scm:1.4 
guile/guile-core/oop/goops/compile.scm:1.5
--- guile/guile-core/oop/goops/compile.scm:1.4  Sun Jun  3 19:32:27 2001
+++ guile/guile-core/oop/goops/compile.scm      Sun Oct 21 05:48:23 2001
@@ -44,11 +44,10 @@
 (define-module (oop goops compile)
   :use-module (oop goops)
   :use-module (oop goops util)
+  :export (compute-cmethod compute-entry-with-cmethod
+          compile-method cmethod-code cmethod-environment)
   :no-backtrace
   )
-
-(export compute-cmethod compute-entry-with-cmethod
-       compile-method cmethod-code cmethod-environment)
 
 (define source-formals cadr)
 (define source-body cddr)
Index: guile/guile-core/oop/goops/composite-slot.scm
diff -u guile/guile-core/oop/goops/composite-slot.scm:1.3 
guile/guile-core/oop/goops/composite-slot.scm:1.4
--- guile/guile-core/oop/goops/composite-slot.scm:1.3   Sun Jun  3 19:32:27 2001
+++ guile/guile-core/oop/goops/composite-slot.scm       Sun Oct 21 05:48:23 2001
@@ -51,9 +51,8 @@
 ;;;;
 
 (define-module (oop goops composite-slot)
-  :use-module (oop goops))
-
-(export <composite-class>)
+  :use-module (oop goops)
+  :export (<composite-class>))
 
 ;;;
 ;;; (define-class CLASS SUPERS
Index: guile/guile-core/oop/goops/describe.scm
diff -u guile/guile-core/oop/goops/describe.scm:1.3 
guile/guile-core/oop/goops/describe.scm:1.4
--- guile/guile-core/oop/goops/describe.scm:1.3 Sun Jun  3 19:32:27 2001
+++ guile/guile-core/oop/goops/describe.scm     Sun Oct 21 05:48:23 2001
@@ -53,9 +53,8 @@
 (define-module (oop goops describe)
   :use-module (oop goops)
   :use-module (ice-9 session)
-  :use-module (ice-9 format))
-
-(export describe)                      ; Export the describe generic function
+  :use-module (ice-9 format)
+  :export (describe))                  ; Export the describe generic function
 
 ;;;
 ;;; describe for simple objects
Index: guile/guile-core/oop/goops/dispatch.scm
diff -u guile/guile-core/oop/goops/dispatch.scm:1.5 
guile/guile-core/oop/goops/dispatch.scm:1.6
--- guile/guile-core/oop/goops/dispatch.scm:1.5 Sun Jul 29 16:48:41 2001
+++ guile/guile-core/oop/goops/dispatch.scm     Sun Oct 21 05:48:23 2001
@@ -1,4 +1,4 @@
-;;;;   Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+;;;;   Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
 ;;;; 
 ;;;; This program is free software; you can redistribute it and/or modify
 ;;;; it under the terms of the GNU General Public License as published by
@@ -45,10 +45,9 @@
   :use-module (oop goops)
   :use-module (oop goops util)
   :use-module (oop goops compile)
+  :export (memoize-method!)
   :no-backtrace
   )
-
-(export memoize-method!)
 
 ;;;
 ;;; This file implements method memoization.  It will finally be
Index: guile/guile-core/oop/goops/old-define-method.scm
diff -u guile/guile-core/oop/goops/old-define-method.scm:1.2 
guile/guile-core/oop/goops/old-define-method.scm:1.3
--- guile/guile-core/oop/goops/old-define-method.scm:1.2        Sun Jun  3 
19:32:27 2001
+++ guile/guile-core/oop/goops/old-define-method.scm    Sun Oct 21 05:48:23 2001
@@ -45,10 +45,9 @@
 
 (define-module (oop goops old-define-method)
   :use-module (oop goops)
+  :export (define-method)
   :no-backtrace
   )
-
-(export define-method)
 
 (define define-method
   (procedure->memoizing-macro
Index: guile/guile-core/oop/goops/save.scm
diff -u guile/guile-core/oop/goops/save.scm:1.6 
guile/guile-core/oop/goops/save.scm:1.7
--- guile/guile-core/oop/goops/save.scm:1.6     Tue Jul 17 01:26:15 2001
+++ guile/guile-core/oop/goops/save.scm Sun Oct 21 05:48:23 2001
@@ -46,14 +46,11 @@
 (define-module (oop goops save)
   :use-module (oop goops internal)
   :use-module (oop goops util)
-  )
-
-(re-export make-unbound)
-
-(export save-objects load-objects restore
-       enumerate! enumerate-component!
-       write-readably write-component write-component-procedure
-       literal? readable make-readable)
+  :re-export (make-unbound)
+  :export (save-objects load-objects restore
+          enumerate! enumerate-component!
+          write-readably write-component write-component-procedure
+          literal? readable make-readable))
 
 ;;;
 ;;; save-objects ALIST PORT [EXCLUDED] [USES]
Index: guile/guile-core/oop/goops/util.scm
diff -u guile/guile-core/oop/goops/util.scm:1.4 
guile/guile-core/oop/goops/util.scm:1.5
--- guile/guile-core/oop/goops/util.scm:1.4     Thu Jul 19 16:27:40 2001
+++ guile/guile-core/oop/goops/util.scm Sun Oct 21 05:48:23 2001
@@ -42,13 +42,12 @@
 
 
 (define-module (oop goops util)
+  :export (any every filter
+          mapappend find-duplicate top-level-env top-level-env?
+          map* for-each* length* improper->proper)
   :no-backtrace
   )
 
-(export any every filter
-       mapappend find-duplicate top-level-env top-level-env?
-       map* for-each* length* improper->proper
- )
 
 ;;;
 ;;; {Utilities}