guile/guile-scsh ChangeLog README USAGE rw.scm

[Gary Houston]

CVSROOT:        /cvs
Module name:    guile
Changes by:     Gary Houston <address@hidden>   01/01/06 14:49:07

Modified files:
        guile-scsh     : ChangeLog README USAGE rw.scm 

Log message:
        * rw.scm (generic-read-string!/partial, read-string!/partial):
        removed, since this version wasn't correct but it's now in
        guile-core.
        * README: "upgraded" the guile-core dependency to tomorrows
        CVS version.

CVSWeb URLs:
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-scsh/ChangeLog.diff?r1=1.49&r2=1.50
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-scsh/README.diff?r1=1.11&r2=1.12
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-scsh/USAGE.diff?r1=1.8&r2=1.9
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-scsh/rw.scm.diff?r1=1.7&r2=1.8

Patches:
Index: guile/guile-scsh/ChangeLog
diff -u guile/guile-scsh/ChangeLog:1.49 guile/guile-scsh/ChangeLog:1.50
--- guile/guile-scsh/ChangeLog:1.49     Mon Jan  1 11:54:29 2001
+++ guile/guile-scsh/ChangeLog  Sat Jan  6 14:49:07 2001
@@ -1,3 +1,11 @@
+2001-01-06  Gary Houston  <address@hidden>
+
+       * rw.scm (generic-read-string!/partial, read-string!/partial):
+       removed, since this version wasn't correct but it's now in
+       guile-core.
+       * README: "upgraded" the guile-core dependency to tomorrows
+       CVS version.
+
 2001-01-01  Gary Houston  <address@hidden>
 
        * lib/string-lib.scm (string-unfold-right, join-strings,
Index: guile/guile-scsh/README
diff -u guile/guile-scsh/README:1.11 guile/guile-scsh/README:1.12
--- guile/guile-scsh/README:1.11        Mon Nov 27 15:59:16 2000
+++ guile/guile-scsh/README     Sat Jan  6 14:49:07 2001
@@ -8,7 +8,8 @@
 
 This version of guile-scsh requires:
 
-1) guile-core dated 27 November 2000 or later.  Version 1.4 is too old.
+1) guile-core dated 07 January 2001 or later for best results.  Version 1.4
+is too old.
 
 2) The guilerxspencer module, available from http://arglist.com/guile/
 
Index: guile/guile-scsh/USAGE
diff -u guile/guile-scsh/USAGE:1.8 guile/guile-scsh/USAGE:1.9
--- guile/guile-scsh/USAGE:1.8  Mon Jan  1 11:54:29 2001
+++ guile/guile-scsh/USAGE      Sat Jan  6 14:49:07 2001
@@ -107,7 +107,7 @@
 ()
 
 (scsh rw)
-(bogus-substring-spec? read-string!/partial read-string/partial read-string! 
read-string write-string write-string/partial)
+(bogus-substring-spec? read-string/partial read-string! read-string 
write-string write-string/partial)
 
 (scsh rx re-low)
 (match:start match:end match:substring new-cre cre-search cre-search? 
cre:string cre:tvec)
Index: guile/guile-scsh/rw.scm
diff -u guile/guile-scsh/rw.scm:1.7 guile/guile-scsh/rw.scm:1.8
--- guile/guile-scsh/rw.scm:1.7 Sun Oct 29 11:53:23 2000
+++ guile/guile-scsh/rw.scm     Sat Jan  6 14:49:07 2001
@@ -7,7 +7,7 @@
   :use-module (scsh errno)
   :use-module (scsh let-opt)
 )
-(export bogus-substring-spec? read-string!/partial read-string/partial
+(export bogus-substring-spec? read-string/partial
        read-string! read-string write-string write-string/partial)
        
 
@@ -19,32 +19,6 @@
 
 ;;; Best-effort/forward-progress reading 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(define (generic-read-string!/partial s start end reader source)
-  (if (bogus-substring-spec? s start end)
-      (error "Bad substring indices" reader source s start end))
-
-  (if (= start end) 0 ; Vacuous request.
-      (let loop ()
-       (catch 'system-error
-              (lambda ()
-                (let ((nread (reader s source start end)))
-                  (and (not (zero? nread)) nread)))
-              (lambda args 
-                (let ((err (car (list-ref args 4))))
-                  (cond ;; ((= err errno/intr) (loop)) ; handled by primitive.
-                       ((or (= err errno/wouldblock); No forward-progess here.
-                            (= err errno/again))
-                        0)
-                       (else (apply scm-error args)))))))))
-
-(define (read-string!/partial s . args)
-  (let-optionals args ((fd/port (current-input-port))
-                      (start   0)
-                      (end     (string-length s)))
-                (generic-read-string!/partial s start end
-                                              uniform-array-read!
-                                              fd/port)))
 
 (define (read-string/partial len . maybe-fd/port) 
   (let* ((s (make-string len))