guile/guile-scsh ChangeLog INCOMPAT USAGE init....

[Gary Houston]

CVSROOT:        /cvs
Module name:    guile
Changes by:     Gary Houston <address@hidden>   01/08/06 15:18:23

Modified files:
        guile-scsh     : ChangeLog INCOMPAT USAGE init.scm newports.scm 
                         syscalls.scm 

Log message:
        * syscalls.scm (itimer): define and export.  it's an interface
        to "alarm", not "setitimer".  weird.
        (open/access-mask, define and export (from scsh fdflags.scm).
        * newports.scm (open-file, open-input-file, open-output-file):
        define and export.  clobbers Guile primitives.
        use modules (scsh syscalls), (scsh let-opt), (scsh utilities),
        (scsh bitwise).
        * init.scm: don't duplicate comments already in USAGE.
        * USAGE, INCOMPAT: updated.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-scsh/ChangeLog.diff?cvsroot=OldCVS&tr1=1.74&tr2=1.75&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-scsh/INCOMPAT.diff?cvsroot=OldCVS&tr1=1.25&tr2=1.26&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-scsh/USAGE.diff?cvsroot=OldCVS&tr1=1.23&tr2=1.24&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-scsh/init.scm.diff?cvsroot=OldCVS&tr1=1.42&tr2=1.43&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-scsh/newports.scm.diff?cvsroot=OldCVS&tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-scsh/syscalls.scm.diff?cvsroot=OldCVS&tr1=1.17&tr2=1.18&r1=text&r2=text

Patches:
Index: guile/guile-scsh/ChangeLog
diff -u guile/guile-scsh/ChangeLog:1.74 guile/guile-scsh/ChangeLog:1.75
--- guile/guile-scsh/ChangeLog:1.74     Sat Aug  4 14:05:06 2001
+++ guile/guile-scsh/ChangeLog  Mon Aug  6 15:18:23 2001
@@ -1,3 +1,15 @@
+2001-08-06  Gary Houston  <address@hidden>
+
+       * syscalls.scm (itimer): define and export.  it's an interface
+       to "alarm", not "setitimer".  weird.
+       (open/access-mask, define and export (from scsh fdflags.scm).
+       * newports.scm (open-file, open-input-file, open-output-file):
+       define and export.  clobbers Guile primitives.
+       use modules (scsh syscalls), (scsh let-opt), (scsh utilities),
+       (scsh bitwise).
+       * init.scm: don't duplicate comments already in USAGE.
+       * USAGE, INCOMPAT: updated.
+
 2001-08-04  Gary Houston  <address@hidden>
 
        * rx/spencer.scm, rx/simp.scm, rx/rx-lib.scm, rx/re.scm,
Index: guile/guile-scsh/INCOMPAT
diff -u guile/guile-scsh/INCOMPAT:1.25 guile/guile-scsh/INCOMPAT:1.26
--- guile/guile-scsh/INCOMPAT:1.25      Sat Aug  4 08:22:08 2001
+++ guile/guile-scsh/INCOMPAT   Mon Aug  6 15:18:23 2001
@@ -11,7 +11,7 @@
 The ODBC interface.
 The char->char partial maps library (CCP).
 
-enabled-interrupts, interrupt-set, itimer, %set-unix-signal-handler,
+enabled-interrupts, interrupt-set, %set-unix-signal-handler,
 set-enabled-interrupts, %unix-signal-handler,
 with-enabled-interrupts*.
 
@@ -43,9 +43,10 @@
 
 with-enabled-interrupts disables all interrupts.
 
-[check that the following are still true in 0.5.2]
+open/async, open/fsync, open/shared-lock, open/exclusive-lock are
+not defined.
 
-the interfaces to the I/O system may be incompatible.
+[FIXME: check that the following are still true]
 
 network-info works when its argument is a socket address (bug in scsh?)
 
Index: guile/guile-scsh/USAGE
diff -u guile/guile-scsh/USAGE:1.23 guile/guile-scsh/USAGE:1.24
--- guile/guile-scsh/USAGE:1.23 Sat Aug  4 15:11:13 2001
+++ guile/guile-scsh/USAGE      Mon Aug  6 15:18:23 2001
@@ -144,7 +144,7 @@
 (let-match if-match match-cond)
 
 (scsh rx re)
-;; redefines regexp?
+;; replaces regexp?
 (%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 open-dsm %make-re-seq 
%make-re-seq/posix re-seq? re-seq:elts re-seq:tsm re-seq:posix set-re-seq:posix 
make-re-seq re-seq %make-re-choice %make-re-choice/posix re-choice? 
re-choice:elts re-choice:tsm re-choice:posix set-re-choice:posix make-re-choice 
re-choice %make-re-repeat %make-re-repeat/posix re-repeat? re-repeat:from 
re-repeat:to re-repeat:body re-repeat:tsm re-repeat:posix set-re-repeat:posix 
make-re-repeat re-repeat reduce-repeat %make-re-submatch 
%make-re-submatch/posix re-submatch? re-submatch:body re-submatch:pre-dsm 
re-submatch:tsm re-submatch:posix set-re-submatch:posix re-submatch:post-dsm 
make-re-submatch re-submatch re-string:chars re-string:posix 
set-re-string:posix re-string re-string? make-re-string make-re-string/posix 
re-trivial re-trivial? re-char-set:cset re-char-set:posix set-re-char-set:posix 
re-char-set? re-char-set make-re-char-set make-re-char-set/posix re-empty 
re-empty? re-bos make-re-bos re-bos? re-eos make-re-eos re-eos? re-bol 
make-re-bol re-bol? re-eol make-re-eol re-eol? re-bow make-re-bow re-bow? 
re-eow make-re-eow re-eow? re-any re-any? re-nonl regexp? re-tsm re-word 
flush-submatches map/changed uncase uncase-char-set uncase-string 
char-set-full? char-set-empty? static-char-class?)
 
 (scsh rx spencer)
@@ -209,7 +209,7 @@
 
 (scsh syscalls)
 ;; replaces pipe, sleep
-(%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 become-session-leader set-umask process-times cpu-ticks/sec 
set-file-mode set-file-owner set-file-group read-symlink delete-directory 
set-file-times file-info file-info:type file-info:gid file-info:inode 
file-info:atime file-info:mtime file-info:ctime file-info:mode file-info:nlinks 
file-info:uid file-info:size sync-file sync-file-system seek/set seek/delta 
seek/end tell pipe signal-process signal-process-group pause-until-interrupt 
user-info user-info:name user-info:uid user-info:gid user-info:home-dir 
user-info:shell name->user-info uid->user-info ->uid ->username %homedir 
group-info group-info:name group-info:gid group-info:members ->gid ->groupname 
directory-files env->alist alist->env fdes-flags set-fdes-flags fdes-status 
set-fdes-status open/read open/write open/read+write open/non-blocking 
open/append open/exclusive open/create open/truncate open/no-control-tty 
fdflags/close-on-exec sleep sleep-until system-name)
+(%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 become-session-leader set-umask process-times cpu-ticks/sec 
set-file-mode set-file-owner set-file-group read-symlink delete-directory 
set-file-times file-info file-info:type file-info:gid file-info:inode 
file-info:atime file-info:mtime file-info:ctime file-info:mode file-info:nlinks 
file-info:uid file-info:size sync-file sync-file-system seek/set seek/delta 
seek/end tell pipe signal-process signal-process-group pause-until-interrupt 
itimer user-info user-info:name user-info:uid user-info:gid user-info:home-dir 
user-info:shell name->user-info uid->user-info ->uid ->username %homedir 
group-info group-info:name group-info:gid group-info:members ->gid ->groupname 
directory-files env->alist alist->env fdes-flags set-fdes-flags fdes-status 
set-fdes-status open/read open/write open/read+write open/non-blocking 
open/append open/exclusive open/create open/truncate open/no-control-tty 
open/access-mask fdflags/close-on-exec sleep sleep-until system-name)
 
 (scsh fname)
 (file-name-as-directory file-name-directory? file-name-non-directory? 
directory-as-file-name ensure-file-name-is-nondirectory file-name-absolute? 
file-name-directory file-name-nondirectory split-file-name path-list->file-name 
file-name-extension file-name-sans-extension replace-extension parse-file-name 
expand-file-name simplify-file-name resolve-tilde-file-name resolve-file-name 
absolute-file-name home-dir home-file)
@@ -246,7 +246,8 @@
 (make-date date? date:seconds date:minute date:hour date:month-day date:month 
date:year date:tz-name date:tz-secs date:summer? date:week-day date:year-day 
set-date:seconds set-date:minute set-date:hour set-date:month-day 
set-date:month set-date:year set-date:tz-name set-date:tz-secs set-date:summer? 
set-date:week-day set-date:year-day modify-date:seconds modify-date:minute 
modify-date:hour modify-date:month-day modify-date:month modify-date:year 
modify-date:tz-name modify-date:tz-secs modify-date:summer? 
modify-date:week-day modify-date:year-day time+ticks ticks/sec time date 
date->string format-date)
 
 (scsh newports)
-(fdport? set-port-buffering bufpol/block bufpol/line bufpol/none call/fdes 
close-after with-current-input-port* with-current-output-port* 
with-current-error-port* with-current-input-port with-current-output-port 
with-current-error-port set-current-input-port! set-current-output-port! 
set-current-error-port!)
+;; replaces open-file, open-input-file, open-output-file
+(fdport? set-port-buffering bufpol/block bufpol/line bufpol/none open-file 
open-input-file open-output-file call/fdes close-after with-current-input-port* 
with-current-output-port* with-current-error-port* with-current-input-port 
with-current-output-port with-current-error-port set-current-input-port! 
set-current-output-port! set-current-error-port!)
 
 (scsh fr)
 (field-splitter infix-splitter suffix-splitter sloppy-suffix-splitter 
record-reader field-reader)
Index: guile/guile-scsh/init.scm
diff -u guile/guile-scsh/init.scm:1.42 guile/guile-scsh/init.scm:1.43
--- guile/guile-scsh/init.scm:1.42      Wed Aug  1 13:42:57 2001
+++ guile/guile-scsh/init.scm   Mon Aug  6 15:18:23 2001
@@ -1,17 +1,8 @@
 (use-modules (ice-9 format)
             (ice-9 receive)
 
-            ;; replaces:
-            ;; map map-in-order for-each member assoc iota list-index
-            ;; delete delete!
             (srfi srfi-1)
-
-            ;; replaces:
-            ;; string-downcase string-downcase!
-            ;; string-upcase string-upcase! string-index
-            ;; string-fill! string-copy string->list
             (srfi srfi-13)
-
             (srfi srfi-14)
 
             (scsh alt-syntax)
@@ -22,7 +13,7 @@
             (scsh fdports)
             (scsh syntax-helpers)
             (scsh bitwise)
-            (scsh utilities)           ; replaces primitive delete.
+            (scsh utilities)
             (scsh define-foreign-syntax)
             (scsh ascii)
             (scsh features)
@@ -38,7 +29,7 @@
             (scsh rx re-low)
             (scsh rx cond-package)
             (scsh rx let-match)
-            (scsh rx re)               ; replaces regexp?
+            (scsh rx re)
             (scsh rx spencer)
             (scsh rx simp)
             (scsh rx posixstr)
@@ -65,7 +56,6 @@
 
             (scsh procobj)
 
-            ;; replaces pipe, sleep
             (scsh syscalls)
 
             (scsh fname)
Index: guile/guile-scsh/newports.scm
diff -u guile/guile-scsh/newports.scm:1.2 guile/guile-scsh/newports.scm:1.3
--- guile/guile-scsh/newports.scm:1.2   Mon Dec  4 15:18:03 2000
+++ guile/guile-scsh/newports.scm       Mon Aug  6 15:18:23 2001
@@ -9,9 +9,23 @@
   :use-module (ice-9 receive)
   :use-module (scsh syntax)
   :use-module (scsh alt-syntax)
+  :use-module (scsh let-opt)
+  :use-module (scsh utilities)
+  :use-module (scsh bitwise)
+  :use-module (scsh syscalls)
 )
+
+(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 open-file #f)
+ (define open-input-file #f)
+ (define open-output-file #f))
+
 (export fdport? set-port-buffering 
        bufpol/block bufpol/line bufpol/none
+       open-file open-input-file open-output-file
        call/fdes close-after
        with-current-input-port* with-current-output-port*
        with-current-error-port*
@@ -46,7 +60,6 @@
 ;;      (err (%fdport-set-buffering/errno port policy size)))
 ;;    (if err (errno-error err set-port-buffering port policy size))))
 
-;; the Guile versions of these don't take compatible arguments.
 ;(define (open-file fname flags . maybe-mode)
 ;  (let ((fd (apply open-fdes fname flags maybe-mode))
 ;      (access (bitwise-and flags open/access-mask)))
@@ -54,17 +67,19 @@
 ;       make-input-fdport
 ;       make-output-fdport)
 ;     fd 0)))
+
+(define open-file open)
 
-;(define (open-input-file fname . maybe-flags)
-;  (let ((flags (:optional maybe-flags 0)))
-;    (open-file fname (deposit-bit-field flags open/access-mask open/read))))
-
-;(define (open-output-file fname . rest)
-;  (let* ((flags (if (pair? rest) (car rest)
-;                  (bitwise-ior open/create open/truncate))) ; default
-;       (maybe-mode (if (null? rest) '() (cdr rest)))
-;       (flags (deposit-bit-field flags open/access-mask open/write)))
-;    (apply open-file fname flags maybe-mode)))
+(define (open-input-file fname . maybe-flags)
+  (let ((flags (:optional maybe-flags 0)))
+    (open-file fname (deposit-bit-field flags open/access-mask open/read))))
+
+(define (open-output-file fname . rest)
+  (let* ((flags (if (pair? rest) (car rest)
+                   (bitwise-ior open/create open/truncate))) ; default
+        (maybe-mode (if (null? rest) '() (cdr rest)))
+        (flags (deposit-bit-field flags open/access-mask open/write)))
+    (apply open-file fname flags maybe-mode)))
 
 
 (define (call/fdes fd/port proc)
Index: guile/guile-scsh/syscalls.scm
diff -u guile/guile-scsh/syscalls.scm:1.17 guile/guile-scsh/syscalls.scm:1.18
--- guile/guile-scsh/syscalls.scm:1.17  Sat Aug  4 08:22:08 2001
+++ guile/guile-scsh/syscalls.scm       Mon Aug  6 15:18:23 2001
@@ -34,7 +34,7 @@
        file-info:nlinks file-info:uid file-info:size
        sync-file sync-file-system
        seek/set seek/delta seek/end tell pipe
-       signal-process signal-process-group pause-until-interrupt
+       signal-process signal-process-group pause-until-interrupt itimer
        user-info user-info:name user-info:uid user-info:gid
        user-info:home-dir user-info:shell
        name->user-info uid->user-info ->uid ->username %homedir
@@ -45,7 +45,8 @@
        fdes-flags set-fdes-flags fdes-status set-fdes-status
        open/read open/write open/read+write open/non-blocking
        open/append open/exclusive open/create open/truncate
-       open/no-control-tty fdflags/close-on-exec
+       open/no-control-tty open/access-mask
+       fdflags/close-on-exec
        sleep sleep-until
        system-name)
 
@@ -711,6 +712,7 @@
 (define pause-until-interrupt pause)
 
 (define-foreign itimer (alarm (uint_t secs)) uint_t)
+(define itimer alarm)
 
 ;;; User info
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -1119,6 +1121,8 @@
 (define open/create O_CREAT)
 (define open/truncate O_TRUNC)
 (define open/no-control-tty O_NOCTTY)
+
+(define open/access-mask (logior open/read open/write open/read+write))
 
 (define fdflags/close-on-exec FD_CLOEXEC)