guile/guile-scsh ChangeLog USAGE awk.scm defrec...

[Gary Houston]

CVSROOT:        /cvs
Module name:    guile
Changes by:     Gary Houston <address@hidden>   01/08/04 14:05:06

Modified files:
        guile-scsh     : ChangeLog USAGE awk.scm defrec.scm glob.scm 
                         procobj.scm scsh.scm utilities.scm 
        guile-scsh/rx  : parse.scm re-subst.scm re-syntax.scm re.scm 
                         rx-lib.scm 

Log message:
        * utilities.scm (delete, filter, first, fold, fold-right, any, every):
        don't export, to avoid replacing (srfi srfi-1) definitions.
        
        * awk.scm, defrec.scm, glob.scm, scsh.scm, rx/parse.scm,
        procobj.scm, utilities.scm: rx/re-subst.scm, rx/re-syntax.scm,
        rx/re.scm, rx/rx-lib.scm: use (srfi srfi-1) for procs removed from
        utilities.scm.
        
        * awk.scm, defrec.scm, glob.scm, rx/parse.scm, rx/re-subst.scm,
        rx/re-syntax.scm, rx/rx-lib.scm: don't use (scsh utilities).

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-scsh/ChangeLog.diff?cvsroot=OldCVS&tr1=1.73&tr2=1.74&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-scsh/USAGE.diff?cvsroot=OldCVS&tr1=1.21&tr2=1.22&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-scsh/awk.scm.diff?cvsroot=OldCVS&tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-scsh/defrec.scm.diff?cvsroot=OldCVS&tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-scsh/glob.scm.diff?cvsroot=OldCVS&tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-scsh/procobj.scm.diff?cvsroot=OldCVS&tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-scsh/scsh.scm.diff?cvsroot=OldCVS&tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-scsh/utilities.scm.diff?cvsroot=OldCVS&tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-scsh/rx/parse.scm.diff?cvsroot=OldCVS&tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-scsh/rx/re-subst.scm.diff?cvsroot=OldCVS&tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-scsh/rx/re-syntax.scm.diff?cvsroot=OldCVS&tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-scsh/rx/re.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/rx-lib.scm.diff?cvsroot=OldCVS&tr1=1.4&tr2=1.5&r1=text&r2=text

Patches:
Index: guile/guile-scsh/ChangeLog
diff -u guile/guile-scsh/ChangeLog:1.73 guile/guile-scsh/ChangeLog:1.74
--- guile/guile-scsh/ChangeLog:1.73     Sat Aug  4 08:22:08 2001
+++ guile/guile-scsh/ChangeLog  Sat Aug  4 14:05:06 2001
@@ -22,6 +22,17 @@
        * README, USAGE, INCOMPAT: updated: now guile-scsh is based on
        scsh 0.5.3.
 
+       * utilities.scm (delete, filter, first, fold, fold-right, any, every):
+       don't export, to avoid replacing (srfi srfi-1) definitions.
+
+       * awk.scm, defrec.scm, glob.scm, scsh.scm, rx/parse.scm,
+       procobj.scm, utilities.scm: rx/re-subst.scm, rx/re-syntax.scm,
+       rx/re.scm, rx/rx-lib.scm: use (srfi srfi-1) for procs removed from
+       utilities.scm.
+
+       * awk.scm, defrec.scm, glob.scm, rx/parse.scm, rx/re-subst.scm,
+       rx/re-syntax.scm, rx/rx-lib.scm: don't use (scsh utilities).
+
 2001-08-03  Gary Houston  <address@hidden>
 
        * glob.scm, fr.scm, fileinfo.scm, let-opt.scm:
Index: guile/guile-scsh/USAGE
diff -u guile/guile-scsh/USAGE:1.21 guile/guile-scsh/USAGE:1.22
--- guile/guile-scsh/USAGE:1.21 Sat Aug  4 08:22:08 2001
+++ guile/guile-scsh/USAGE      Sat Aug  4 14:05:06 2001
@@ -6,12 +6,13 @@
 Warning: this will take a while and will clobber various Guile
 definitions.
 
-For script usage it's probably more useful to import parts of scsh
-individually using the Guile module system.  However note that macros
-may expand to code that requires additional modules.  e.g., `run' is
-defined in (scsh syntax), but requires loading (scsh procobj), (scsh
-scsh), (scsh fdports) and (scsh syntax-helpers) to execute
-sucessfully.  This may be a deficiency of the Guile module system.
+When writing new software it's probably more useful to import parts of
+scsh individually using the Guile module system.  However note that
+macros may expand to code that requires additional modules.  e.g.,
+`run' is defined in (scsh syntax), but requires loading (scsh
+procobj), (scsh scsh), (scsh fdports) and (scsh syntax-helpers) to
+execute sucessfully.  This may be a deficiency of the Guile module
+system.
 
 One way to avoid clobbering definitions from libguile is to define a
 new module for the code that uses guile-scsh.  e.g.,
@@ -52,8 +53,6 @@
 ;; replaces:
 ;; map map-in-order for-each member assoc iota list-index
 ;; delete delete!
-;; following are defined in (scsh utilities) too, possibly incompatibly:
-;; delete filter first fold fold-right any every
 (xcons list-tabulate circular-list proper-list? circular-list? dotted-list? 
null-list? not-pair? list= first second third fourth fifth sixth seventh eighth 
ninth tenth car+cdr take drop take-right drop-right take! drop-right! split-at 
split-at! last length+ concatenate concatenate! append-reverse append-reverse! 
zip unzip1 unzip2 unzip3 unzip4 unzip5 count fold fold-right pair-fold 
pair-fold-right reduce reduce-right unfold unfold-right append-map append-map! 
map! pair-for-each filter-map filter partition remove filter! partition! 
remove! find find-tail take-while take-while! drop-while span span! break 
break! any every delete-duplicates delete-duplicates! alist-cons alist-copy 
alist-delete alist-delete! lset<= lset= lset-adjoin lset-union 
lset-intersection lset-difference lset-xor lset-diff+intersection lset-union! 
lset-intersection! lset-difference! lset-xor! lset-diff+intersection! iota map 
map-in-order for-each list-index member delete delete! assoc)
 
 (srfi srfi-13)
@@ -99,9 +98,7 @@
 
 (scsh utilities)
 ;; "delete" is incompatile with guile primitive.
-;; following are defined in (srfi srfi-1) too, possibly incompatibly:
-;; delete filter first fold fold-right any every
-(del delete filter first first? nth fold fold-right any every mapv mapv! 
vector-every? copy-vector initialize-vector vector-append vfold vfold-right 
check-arg conjoin disjoin negate compose call/cc deprecated-proc 
deposit-bit-field real->exact-integer)
+(del delete first? nth mapv mapv! vector-every? copy-vector initialize-vector 
vector-append vfold vfold-right check-arg conjoin disjoin negate compose 
call/cc deprecated-proc deposit-bit-field real->exact-integer)
 
 (scsh define-foreign-syntax)
 ;; dummy definitions.
Index: guile/guile-scsh/awk.scm
diff -u guile/guile-scsh/awk.scm:1.4 guile/guile-scsh/awk.scm:1.5
--- guile/guile-scsh/awk.scm:1.4        Wed Jan 24 14:30:51 2001
+++ guile/guile-scsh/awk.scm    Sat Aug  4 14:05:06 2001
@@ -3,8 +3,8 @@
 
 (define-module (scsh awk)
   :use-module (ice-9 receive)
+  :use-module (srfi srfi-1)
   :use-module (scsh rdelim)
-  :use-module (scsh utilities)
   :use-module (scsh alt-syntax)
   :use-module (scsh rx parse)
   :use-module (scsh rx re-low)
Index: guile/guile-scsh/defrec.scm
diff -u guile/guile-scsh/defrec.scm:1.5 guile/guile-scsh/defrec.scm:1.6
--- guile/guile-scsh/defrec.scm:1.5     Sat Dec  2 13:01:40 2000
+++ guile/guile-scsh/defrec.scm Sat Aug  4 14:05:06 2001
@@ -77,7 +77,7 @@
 (define-module (scsh defrec)
   :use-module (scsh alt-syntax)
   :use-module (ice-9 receive)
-  :use-module (scsh utilities)
+  :use-module (srfi srfi-1)
 )
 (export-syntax define-record-discloser define-record)
 
Index: guile/guile-scsh/glob.scm
diff -u guile/guile-scsh/glob.scm:1.5 guile/guile-scsh/glob.scm:1.6
--- guile/guile-scsh/glob.scm:1.5       Sat Aug  4 03:26:37 2001
+++ guile/guile-scsh/glob.scm   Sat Aug  4 14:05:06 2001
@@ -14,7 +14,7 @@
   :use-module (scsh fileinfo)
   :use-module (scsh rx re-high)
   :use-module (scsh rx re)
-  :use-module (scsh utilities)
+  :use-module (srfi srfi-1)
   :use-module (srfi srfi-14)
   :use-module (scsh scsh-condition)
   :use-module (scsh syscalls)
Index: guile/guile-scsh/procobj.scm
diff -u guile/guile-scsh/procobj.scm:1.5 guile/guile-scsh/procobj.scm:1.6
--- guile/guile-scsh/procobj.scm:1.5    Mon Dec  4 15:18:03 2000
+++ guile/guile-scsh/procobj.scm        Sat Aug  4 14:05:06 2001
@@ -11,6 +11,7 @@
 
 (define-module (scsh procobj)
   :use-module (ice-9 receive)
+  :use-module (srfi srfi-1)
   :use-module (scsh defrec)
   :use-module (scsh population)
   :use-module (scsh utilities)
Index: guile/guile-scsh/rx/parse.scm
diff -u guile/guile-scsh/rx/parse.scm:1.5 guile/guile-scsh/rx/parse.scm:1.6
--- guile/guile-scsh/rx/parse.scm:1.5   Sat Aug  4 08:22:08 2001
+++ guile/guile-scsh/rx/parse.scm       Sat Aug  4 14:05:06 2001
@@ -45,7 +45,7 @@
 ;;; the regexp at run-time.
 
 (define-module (scsh rx parse)
-  :use-module (scsh utilities)
+  :use-module (srfi srfi-1)
   :use-module (srfi srfi-14)
   :use-module (ice-9 receive)
   :use-module (scsh ascii)
Index: guile/guile-scsh/rx/re-subst.scm
diff -u guile/guile-scsh/rx/re-subst.scm:1.5 
guile/guile-scsh/rx/re-subst.scm:1.6
--- guile/guile-scsh/rx/re-subst.scm:1.5        Sat Jul  7 08:35:28 2001
+++ guile/guile-scsh/rx/re-subst.scm    Sat Aug  4 14:05:06 2001
@@ -11,8 +11,8 @@
 
 (define-module (scsh rx re-subst)
   :use-module (ice-9 receive)
+  :use-module (srfi srfi-1)
   :use-module (srfi srfi-13)
-  :use-module (scsh utilities)
   :use-module (scsh rw)
   :use-module (scsh rx re-low)
   :use-module (scsh rx re-high)
Index: guile/guile-scsh/rx/re-syntax.scm
diff -u guile/guile-scsh/rx/re-syntax.scm:1.2 
guile/guile-scsh/rx/re-syntax.scm:1.3
--- guile/guile-scsh/rx/re-syntax.scm:1.2       Sun Oct 29 11:53:23 2000
+++ guile/guile-scsh/rx/re-syntax.scm   Sat Aug  4 14:05:06 2001
@@ -7,7 +7,7 @@
 ;;; We only shallowly check the initial keyword of a compound form.
 
 (define-module (scsh rx re-syntax)
-  :use-module (scsh utilities)
+  :use-module (srfi srfi-1)
   :use-module (scsh alt-syntax)
   :use-module (scsh rx simp)
   :use-module (scsh rx parse)
Index: guile/guile-scsh/rx/re.scm
diff -u guile/guile-scsh/rx/re.scm:1.6 guile/guile-scsh/rx/re.scm:1.7
--- guile/guile-scsh/rx/re.scm:1.6      Sat Aug  4 08:22:08 2001
+++ guile/guile-scsh/rx/re.scm  Sat Aug  4 14:05:06 2001
@@ -16,6 +16,7 @@
 
 (define-module (scsh rx re)
   :use-module (ice-9 receive)
+  :use-module (srfi srfi-1)
   :use-module (srfi srfi-13)
   :use-module (srfi srfi-14)
   :use-module (scsh defrec)
Index: guile/guile-scsh/rx/rx-lib.scm
diff -u guile/guile-scsh/rx/rx-lib.scm:1.4 guile/guile-scsh/rx/rx-lib.scm:1.5
--- guile/guile-scsh/rx/rx-lib.scm:1.4  Sat Aug  4 08:22:08 2001
+++ guile/guile-scsh/rx/rx-lib.scm      Sat Aug  4 14:05:06 2001
@@ -4,7 +4,7 @@
 ;;; char-set, or regexp value. Coerce one of these to a regexp value.
 
 (define-module (scsh rx rx-lib)
-  :use-module (scsh utilities)
+  :use-module (srfi srfi-1)
   :use-module (srfi srfi-14)
   :use-module (scsh ascii)
   :use-module (scsh rx re)
Index: guile/guile-scsh/scsh.scm
diff -u guile/guile-scsh/scsh.scm:1.14 guile/guile-scsh/scsh.scm:1.15
--- guile/guile-scsh/scsh.scm:1.14      Sat Aug  4 08:22:08 2001
+++ guile/guile-scsh/scsh.scm   Sat Aug  4 14:05:06 2001
@@ -6,6 +6,7 @@
 (define-module (scsh scsh)
   :use-module (ice-9 receive)
   :use-module (ice-9 format)
+  :use-module (srfi srfi-1)
   :use-module (scsh utilities)
   :use-module (scsh syscalls)
   :use-module (scsh syntax)
Index: guile/guile-scsh/utilities.scm
diff -u guile/guile-scsh/utilities.scm:1.8 guile/guile-scsh/utilities.scm:1.9
--- guile/guile-scsh/utilities.scm:1.8  Wed Aug  1 12:12:53 2001
+++ guile/guile-scsh/utilities.scm      Sat Aug  4 14:05:06 2001
@@ -2,18 +2,11 @@
 ;;; Copyright (c) 1993 by Olin Shivers. See file COPYING.
 
 (define-module (scsh utilities)
+  :use-module (srfi srfi-1)
   :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
+(export del first? nth
        mapv mapv! vector-every? copy-vector initialize-vector vector-append
        vfold vfold-right
        check-arg conjoin disjoin negate compose call/cc
@@ -21,6 +14,8 @@
        deposit-bit-field
        real->exact-integer
        ;; reverse! omitted.
+       ;; delete, filter, first, fold, fold-right, any, every: use srfi-1.
+       ;; first: incompatible with srfi-1.
 )
 
 (define (del elt lis)
@@ -35,43 +30,43 @@
                      '()))))
     (del lis)))
 
-(define (delete pred lis)
-  (filter (lambda (x) (not (pred x))) lis))
+;(define (delete pred lis)
+;  (filter (lambda (x) (not (pred x))) lis))
 
-(define (fold kons knil lis)
-  (let lp ((lis lis) (ans knil))
-    (if (pair? lis)
-       (lp (cdr lis) (kons (car lis) ans))
-       ans)))
-
-(define (fold-right kons knil lis)
-  (let recur ((lis lis))
-    (if (pair? lis)
-       (let ((head (car lis)))         ; Won't need LIS after RECUR call. 
-         (kons head (recur (cdr lis))))
-       knil)))
-
-(define (filter pred list)
-  (letrec ((filter (lambda (list)
-                    (if (pair? list)
-                        (let* ((head (car list))
-                               (tail (cdr list))
-                               (new-tail (filter tail)))
-                          (if (pred head)
-                              (if (eq? tail new-tail) list
-                                  (cons head new-tail))
-                              new-tail))
-                        '()))))
-    (filter list)))
+;(define (fold kons knil lis)
+;   (let lp ((lis lis) (ans knil))
+;     (if (pair? lis)
+;      (lp (cdr lis) (kons (car lis) ans))
+;      ans)))
+
+; (define (fold-right kons knil lis)
+;   (let recur ((lis lis))
+;     (if (pair? lis)
+;      (let ((head (car lis)))         ; Won't need LIS after RECUR call. 
+;        (kons head (recur (cdr lis))))
+;      knil)))
+
+; (define (filter pred list)
+;   (letrec ((filter (lambda (list)
+;                   (if (pair? list)
+;                       (let* ((head (car list))
+;                              (tail (cdr list))
+;                              (new-tail (filter tail)))
+;                         (if (pred head)
+;                             (if (eq? tail new-tail) list
+;                                 (cons head new-tail))
+;                             new-tail))
+;                       '()))))
+;     (filter list)))
+
+; (define (first pred list)
+;   (letrec ((lp (lambda (list)
+;               (and (pair? list)
+;                    (let ((head (car list)))
+;                      (if (pred head) head
+;                          (lp (cdr list))))))))
+;    (lp list)))
 
-(define (first pred list)
-  (letrec ((lp (lambda (list)
-                (and (pair? list)
-                     (let ((head (car list)))
-                       (if (pred head) head
-                           (lp (cdr list))))))))
-    (lp list)))
-
 ;;; Returns the first true value produced by PRED, not the list element
 ;;; that satisfied PRED.
 
@@ -82,14 +77,14 @@
                          (lp (cdr list)))))))
     (lp list)))
 
-(define any first?)
+;(define any first?)
 
-(define (every pred list)
-  (or (not (pair? list))       
-      (let lp ((head (car list))  (tail (cdr list)))
-       (if (pair? tail)
-           (and (pred head) (lp (car tail) (cdr tail)))
-           (pred head)))))             ; Tail-call the last PRED call.
+; (define (every pred list)
+;   (or (not (pair? list))     
+;       (let lp ((head (car list))  (tail (cdr list)))
+;      (if (pair? tail)
+;          (and (pred head) (lp (car tail) (cdr tail)))
+;          (pred head)))))             ; Tail-call the last PRED call.
 
 
 (define (mapv f v)