guile/guile-scsh ChangeLog USAGE char-set.scm f...

[Gary Houston]

CVSROOT:        /cvs
Module name:    guile
Changes by:     Gary Houston <address@hidden>   01/07/07 08:35:29

Modified files:
        guile-scsh     : ChangeLog USAGE char-set.scm fileinfo.scm 
                         filesys.scm fluid.scm fname.scm 
                         make-module-list rdelim.scm rw.scm scsh.scm 
                         syscalls.scm utilities.scm 
        guile-scsh/rx  : posixstr.scm re-subst.scm re.scm 

Log message:
        * scsh.scm (run/port, run/file, run/string, run/strings, run/sexp,
        run/sexps): don't export, they are defined in (scsh syntax).
        * rw.scm, rdelim.scm: use re-export instead of export for
        re-exporting from guile-core modules.
        * char-set.scm: remove char-set- prefix from string-iter, since
        it's no longer defined elsewhere.
        * fname.scm, rx/posixstr.scm, rx/re-subst.scm, rx/re.scm:
        use (srfi srfi-13) instead of (lib string-lib).
        * syscalls.scm, utilities.scm, fluid.scm, filesys.scm, rdelim.scm,
        rx/re.scm:
        add deprecated blocks to create bindings for features that
        override guile-core.
        USAGE: updated.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-scsh/ChangeLog.diff?cvsroot=OldCVS&tr1=1.64&tr2=1.65&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-scsh/USAGE.diff?cvsroot=OldCVS&tr1=1.16&tr2=1.17&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-scsh/char-set.scm.diff?cvsroot=OldCVS&tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-scsh/fileinfo.scm.diff?cvsroot=OldCVS&tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-scsh/filesys.scm.diff?cvsroot=OldCVS&tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-scsh/fluid.scm.diff?cvsroot=OldCVS&tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-scsh/fname.scm.diff?cvsroot=OldCVS&tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-scsh/make-module-list.diff?cvsroot=OldCVS&tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-scsh/rdelim.scm.diff?cvsroot=OldCVS&tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-scsh/rw.scm.diff?cvsroot=OldCVS&tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-scsh/scsh.scm.diff?cvsroot=OldCVS&tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-scsh/syscalls.scm.diff?cvsroot=OldCVS&tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-scsh/utilities.scm.diff?cvsroot=OldCVS&tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-scsh/rx/posixstr.scm.diff?cvsroot=OldCVS&tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-scsh/rx/re-subst.scm.diff?cvsroot=OldCVS&tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-scsh/rx/re.scm.diff?cvsroot=OldCVS&tr1=1.3&tr2=1.4&r1=text&r2=text

Patches:
Index: guile/guile-scsh/ChangeLog
diff -u guile/guile-scsh/ChangeLog:1.64 guile/guile-scsh/ChangeLog:1.65
--- guile/guile-scsh/ChangeLog:1.64     Fri Jul  6 14:47:58 2001
+++ guile/guile-scsh/ChangeLog  Sat Jul  7 08:35:28 2001
@@ -1,3 +1,19 @@
+2001-07-07  Gary Houston  <address@hidden>
+
+       * scsh.scm (run/port, run/file, run/string, run/strings, run/sexp,
+       run/sexps): don't export, they are defined in (scsh syntax).
+       * rw.scm, rdelim.scm: use re-export instead of export for
+       re-exporting from guile-core modules.
+       * char-set.scm: remove char-set- prefix from string-iter, since
+       it's no longer defined elsewhere.
+       * fname.scm, rx/posixstr.scm, rx/re-subst.scm, rx/re.scm:
+       use (srfi srfi-13) instead of (lib string-lib).
+       * syscalls.scm, utilities.scm, fluid.scm, filesys.scm, rdelim.scm,
+       rx/re.scm:
+       add deprecated blocks to create bindings for features that
+       override guile-core.
+       USAGE: updated.
+
 2001-07-06  Gary Houston  <address@hidden>
 
        * lib/string-lib.scm: removed.
Index: guile/guile-scsh/USAGE
diff -u guile/guile-scsh/USAGE:1.16 guile/guile-scsh/USAGE:1.17
--- guile/guile-scsh/USAGE:1.16 Fri Jul  6 14:47:58 2001
+++ guile/guile-scsh/USAGE      Sat Jul  7 08:35:28 2001
@@ -232,6 +232,10 @@
 (scsh glob)
 (glob glob-quote maybe-directory-files)
 
+(scsh fileinfo)
+;; replaces file-exists?
+(file-not-readable? file-not-writable? file-not-executable? file-readable? 
file-writable? file-executable? file-not-exists? file-exists? file-type 
file-group file-inode file-last-access file-last-mod file-last-status-change 
file-mode file-nlinks file-owner file-size file-directory? file-fifo? 
file-regular? file-socket? file-special? file-symlink?)
+
 (scsh filesys)
 ;; replaces rename-file.
 (delete-filesys-object create-directory create-fifo create-hard-link 
create-symlink rename-file)
@@ -258,4 +262,4 @@
 (socket-connect bind-listen-accept-loop socket? socket:family socket:inport 
socket:outport socket-address? socket-address:address socket-address:family 
internet-address->socket-address socket-address->internet-address create-socket 
close-socket bind-socket connect-socket listen-socket accept-connection 
socket-remote-address socket-local-address shutdown-socket create-socket-pair 
receive-message receive-message! receive-message/partial 
receive-message!/partial send-message send-message/partial socket-option 
set-socket-option host-info host-info? host-info:name host-info:aliases 
host-info:addresses network-info network-info? network-info:name 
network-info:aliases network-info:net service-info service-info? 
service-info:name service-info:aliases service-info:port service-info:protocol 
protocol-info protocol-info? protocol-info:name protocol-info:aliases 
protocol-info:number)
 
 (scsh scsh)
-(call-terminally fork/pipe %fork/pipe tail-pipe tail-pipe+ alist-update 
alist-compress add-before add-after with-env* with-total-env* with-cwd* 
with-umask* create-temp-file temp-file-channel run/collecting* run/port+proc* 
run/port* run/file* run/string* run/strings* run/sexp* run/sexps* port->string 
port->string-list port->sexp-list port->list port-fold char-filter 
string-filter y-or-n? stdio->stdports with-stdio-ports* stdports->stdio 
command-line-arguments arg* arg argv home-directory exec-path-list suspend 
exec/env exec-path/env exec-path exec fork %fork stringify with-cwd with-umask 
with-env with-total-env run/port run/file run/string run/strings run/sexp 
run/sexps with-stdio-ports)
+(call-terminally fork/pipe %fork/pipe tail-pipe tail-pipe+ alist-update 
alist-compress add-before add-after with-env* with-total-env* with-cwd* 
with-umask* create-temp-file temp-file-channel run/collecting* run/port+proc* 
run/port* run/file* run/string* run/strings* run/sexp* run/sexps* port->string 
port->string-list port->sexp-list port->list port-fold char-filter 
string-filter y-or-n? stdio->stdports with-stdio-ports* stdports->stdio 
command-line-arguments arg* arg argv home-directory exec-path-list suspend 
exec/env exec-path/env exec-path exec fork %fork stringify with-cwd with-umask 
with-env with-total-env with-stdio-ports)
Index: guile/guile-scsh/char-set.scm
diff -u guile/guile-scsh/char-set.scm:1.3 guile/guile-scsh/char-set.scm:1.4
--- guile/guile-scsh/char-set.scm:1.3   Sun Oct 29 11:53:23 2000
+++ guile/guile-scsh/char-set.scm       Sat Jul  7 08:35:28 2001
@@ -340,9 +340,7 @@
 ;;; Apply P to each index and it's char in S: (P I C).
 ;;; Used by the intersection & difference.
 
-;;; char-set- prefix added for Guile to avoid conflict with 
-;;; string-iter defined in lib/string-lib.scm.
-(define (char-set-string-iter p s)
+(define (string-iter p s)
   (let lp ((i (- (string-length s) 1)))
     (cond ((>= i 0)
           (p i (string-ref s i))
@@ -350,7 +348,7 @@
 
 (define (char-set-invert! cset)
   (let ((s (char-set:s cset)))
-    (char-set-string-iter (lambda (i c)
+    (string-iter (lambda (i c)
                     (string-set! s i (ascii->char (- 1 (char->ascii c)))))
                 s))
   cset)
@@ -368,7 +366,7 @@
 (define (char-set-intersection! cset1 . csets)
   (let ((s (char-set:s cset1)))
     (for-each (lambda (cset)
-               (char-set-string-iter (lambda (i c)
+               (string-iter (lambda (i c)
                               (if (zero? (char->ascii c))
                                   (string-set! s i (ascii->char 0))))
                             (char-set:s cset)))
Index: guile/guile-scsh/fileinfo.scm
diff -u guile/guile-scsh/fileinfo.scm:1.3 guile/guile-scsh/fileinfo.scm:1.4
--- guile/guile-scsh/fileinfo.scm:1.3   Mon Dec  4 15:18:03 2000
+++ guile/guile-scsh/fileinfo.scm       Sat Jul  7 08:35:28 2001
@@ -15,6 +15,13 @@
   :use-module (scsh utilities)
   :use-module (scsh errno)
 )
+
+(begin-deprecated
+ ;; Prevent `export' from re-exporting core bindings.  This behaviour
+ ;; of `export' is deprecated and will disappear in one of the next
+ ;; releases.
+ (define file-exists? #f))
+
 (export file-not-readable? file-not-writable? file-not-executable?
        file-readable? file-writable? file-executable?
        file-not-exists? file-exists?
Index: guile/guile-scsh/filesys.scm
diff -u guile/guile-scsh/filesys.scm:1.5 guile/guile-scsh/filesys.scm:1.6
--- guile/guile-scsh/filesys.scm:1.5    Wed Jun  6 15:00:34 2001
+++ guile/guile-scsh/filesys.scm        Sat Jul  7 08:35:28 2001
@@ -11,6 +11,13 @@
   :use-module (scsh errno)
   :use-module (scsh scsh)
 )
+
+(begin-deprecated
+ ;; Prevent `export' from re-exporting core bindings.  This behaviour
+ ;; of `export' is deprecated and will disappear in one of the next
+ ;; releases.
+ (define rename-file #f))
+
 (export delete-filesys-object create-directory create-fifo create-hard-link
        create-symlink rename-file)
 
Index: guile/guile-scsh/fluid.scm
diff -u guile/guile-scsh/fluid.scm:1.2 guile/guile-scsh/fluid.scm:1.3
--- guile/guile-scsh/fluid.scm:1.2      Mon Nov 27 13:27:04 2000
+++ guile/guile-scsh/fluid.scm  Sat Jul  7 08:35:28 2001
@@ -1,10 +1,17 @@
 ;; implementation of scheme48 fluid variables using libguile fluids.
 
 (define-module (scsh fluid))
-(export make-fluid set-fluid! fluid let-fluid)
 
 (if (not (defined? 'guile-make-fluid))
     (define guile-make-fluid make-fluid))
+
+(begin-deprecated
+ ;; Prevent `export' from re-exporting core bindings.  This behaviour
+ ;; of `export' is deprecated and will disappear in one of the next
+ ;; releases.
+ (define make-fluid #f))
+
+(export make-fluid set-fluid! fluid let-fluid)
 
 (define (make-fluid value)
   (let ((result (guile-make-fluid)))
Index: guile/guile-scsh/fname.scm
diff -u guile/guile-scsh/fname.scm:1.4 guile/guile-scsh/fname.scm:1.5
--- guile/guile-scsh/fname.scm:1.4      Sat Dec  2 13:01:40 2000
+++ guile/guile-scsh/fname.scm  Sat Jul  7 08:35:28 2001
@@ -12,9 +12,9 @@
 ;;;    pathnm sfile strnin unxcwd unxdir unxpar unxprm unxpth unxunp wrkdir
 
 (define-module (scsh fname)
-  :use-module (scsh lib string-lib)
-  :use-module (scsh let-opt)
   :use-module (ice-9 receive)
+  :use-module (srfi srfi-13)
+  :use-module (scsh let-opt)
   :use-module (scsh syscalls))
 
 (export file-name-as-directory
Index: guile/guile-scsh/make-module-list
diff -u guile/guile-scsh/make-module-list:1.4 
guile/guile-scsh/make-module-list:1.5
--- guile/guile-scsh/make-module-list:1.4       Wed Dec  6 15:10:39 2000
+++ guile/guile-scsh/make-module-list   Sat Jul  7 08:35:28 2001
@@ -24,7 +24,6 @@
         jar-defrecord
         char-set
         defrec
-        lib/string-lib
         errno
         rw
         rx/re-low
@@ -53,9 +52,9 @@
         fluid
         stringcoll
         scsh-condition
-        lib/list-lib
         syntax
         glob
+        fileinfo
         filesys
         time
         newports
Index: guile/guile-scsh/rdelim.scm
diff -u guile/guile-scsh/rdelim.scm:1.7 guile/guile-scsh/rdelim.scm:1.8
--- guile/guile-scsh/rdelim.scm:1.7     Wed Jan 24 14:30:51 2001
+++ guile/guile-scsh/rdelim.scm Sat Jul  7 08:35:28 2001
@@ -13,13 +13,21 @@
   :use-module (scsh errno)
 )
 
+(if (not (defined? 'guile-read-delimited))
+    (define guile-read-delimited read-delimited))
+
+(begin-deprecated
+ ;; Prevent `export' from re-exporting (ice-9 rdelim) bindings.  This behaviour
+ ;; of `export' is deprecated and will disappear in one of the next
+ ;; releases.
+ (define read-line #f)
+ (define read-delimited #f)
+ (define read-delimited! #f))
+
 (export read-line read-paragraph read-delimited read-delimited! skip-char-set)
 
 ;; unchanged from (ice-9 rdelim)
-(export %read-delimited!)
-
-(if (not (defined? 'guile-read-delimited))
-    (define guile-read-delimited read-delimited))
+(re-export %read-delimited!)
 
 (define (read-delimited delims . args)
   (let ((rv
Index: guile/guile-scsh/rw.scm
diff -u guile/guile-scsh/rw.scm:1.12 guile/guile-scsh/rw.scm:1.13
--- guile/guile-scsh/rw.scm:1.12        Mon Jun  4 15:07:06 2001
+++ guile/guile-scsh/rw.scm     Sat Jul  7 08:35:28 2001
@@ -12,7 +12,7 @@
        read-string! read-string write-string)
 
 ;; from (ice-9 rw)
-(export read-string!/partial write-string/partial)
+(re-export read-string!/partial write-string/partial)
 
 (define (bogus-substring-spec? s start end)
   (or (< start 0)
Index: guile/guile-scsh/rx/posixstr.scm
diff -u guile/guile-scsh/rx/posixstr.scm:1.3 
guile/guile-scsh/rx/posixstr.scm:1.4
--- guile/guile-scsh/rx/posixstr.scm:1.3        Sat Dec  2 13:01:40 2000
+++ guile/guile-scsh/rx/posixstr.scm    Sat Jul  7 08:35:28 2001
@@ -55,6 +55,7 @@
 
 (define-module (scsh rx posixstr)
   :use-module (ice-9 receive)
+  :use-module (srfi srfi-13)
   :use-module (scsh utilities)
   :use-module (scsh char-set)
   :use-module (scsh ascii)
@@ -62,7 +63,6 @@
   :use-module (scsh rx simp)
   :use-module (scsh rx cond-package)
   :use-module (scsh rx parse)
-  :use-module (scsh lib string-lib)
 )
 (export regexp->posix-string)
 
Index: guile/guile-scsh/rx/re-subst.scm
diff -u guile/guile-scsh/rx/re-subst.scm:1.4 
guile/guile-scsh/rx/re-subst.scm:1.5
--- guile/guile-scsh/rx/re-subst.scm:1.4        Tue May 29 13:50:46 2001
+++ guile/guile-scsh/rx/re-subst.scm    Sat Jul  7 08:35:28 2001
@@ -11,9 +11,9 @@
 
 (define-module (scsh rx re-subst)
   :use-module (ice-9 receive)
+  :use-module (srfi srfi-13)
   :use-module (scsh utilities)
   :use-module (scsh rw)
-  :use-module (scsh lib string-lib)
   :use-module (scsh rx re-low)
   :use-module (scsh rx re-high)
 )
Index: guile/guile-scsh/rx/re.scm
diff -u guile/guile-scsh/rx/re.scm:1.3 guile/guile-scsh/rx/re.scm:1.4
--- guile/guile-scsh/rx/re.scm:1.3      Sat Dec  2 13:01:40 2000
+++ guile/guile-scsh/rx/re.scm  Sat Jul  7 08:35:28 2001
@@ -15,14 +15,20 @@
 ;;; submatches, then POST-DSM as dead submatches.
 
 (define-module (scsh rx re)
+  :use-module (ice-9 receive)
+  :use-module (srfi srfi-13)
   :use-module (scsh defrec)
   :use-module (scsh jar-defrecord)
   :use-module (scsh rx re-low)
-  :use-module (ice-9 receive)
   :use-module (scsh utilities)
   :use-module (scsh char-set)
-  :use-module (scsh rx cond-package)
-  :use-module (scsh lib string-lib))
+  :use-module (scsh rx cond-package))
+
+(begin-deprecated
+ ;; Prevent `export' from re-exporting core bindings.  This behaviour
+ ;; of `export' is deprecated and will disappear in one of the next
+ ;; releases.
+ (define regexp? #f))
 
 (export %make-re-dsm %make-re-dsm/posix re-dsm? re-dsm:body re-dsm:pre-dsm
        re-dsm:tsm re-dsm:posix set-re-dsm:posix re-dsm:post-dsm re-dsm
Index: guile/guile-scsh/scsh.scm
diff -u guile/guile-scsh/scsh.scm:1.12 guile/guile-scsh/scsh.scm:1.13
--- guile/guile-scsh/scsh.scm:1.12      Wed Jan 24 14:30:51 2001
+++ guile/guile-scsh/scsh.scm   Sat Jul  7 08:35:28 2001
@@ -39,7 +39,6 @@
        fork %fork stringify
 )
 (export-syntax with-cwd with-umask with-env with-total-env
-              run/port run/file run/string run/strings run/sexp run/sexps
               with-stdio-ports
 )
 
Index: guile/guile-scsh/syscalls.scm
diff -u guile/guile-scsh/syscalls.scm:1.15 guile/guile-scsh/syscalls.scm:1.16
--- guile/guile-scsh/syscalls.scm:1.15  Fri May 25 13:09:15 2001
+++ guile/guile-scsh/syscalls.scm       Sat Jul  7 08:35:28 2001
@@ -15,6 +15,14 @@
   :use-module (scsh procobj)
   :use-module (scsh errno)
 )
+
+(begin-deprecated
+ ;; Prevent `export' from re-exporting core bindings.  This behaviour
+ ;; of `export' is deprecated and will disappear in one of the next
+ ;; releases.
+ (define pipe #f)
+ (define sleep #f))
+
 (export %exec %%fork cwd user-gid user-effective-gid set-gid
        user-supplementary-gids user-uid user-effective-uid set-uid
        user-login-name pid parent-pid set-process-group
Index: guile/guile-scsh/utilities.scm
diff -u guile/guile-scsh/utilities.scm:1.6 guile/guile-scsh/utilities.scm:1.7
--- guile/guile-scsh/utilities.scm:1.6  Sun Oct 15 13:14:50 2000
+++ guile/guile-scsh/utilities.scm      Sat Jul  7 08:35:28 2001
@@ -4,6 +4,13 @@
 (define-module (scsh utilities)
   :use-module (scsh loophole)
   :use-module (scsh bitwise))
+
+(begin-deprecated
+ ;; Prevent `export' from re-exporting core bindings.  This behaviour
+ ;; of `export' is deprecated and will disappear in one of the next
+ ;; releases.
+ (define delete #f))
+
 (export del delete filter first first? nth
        fold fold-right
        any every