guile/guile-scsh ChangeLog Makefile.am USAGE fr...

[Gary Houston]

CVSROOT:        /cvs
Module name:    guile
Changes by:     Gary Houston <address@hidden>   01/08/01 13:42:57

Modified files:
        guile-scsh     : ChangeLog Makefile.am USAGE fr.scm glob.scm 
                         here.scm init.scm make-module-list rdelim.scm 
        guile-scsh/rx  : parse.scm posixstr.scm re.scm rx-lib.scm 
                         simp.scm spencer.scm 
Added files:
        guile-scsh     : cset-obsolete.scm 
Removed files:
        guile-scsh     : char-set.scm 

Log message:
        * cset-obsolete.scm: new file from scsh-0.5.3.  defines module
        (scsh cset-obsolete).   Add reduce-char-set from char-set.scm.
        
        * char-set.scm: deleted.  (scsh char-set) is replaced by
        (srfi srfi-14), (scsh char-p) and (scsh cset-obsolete).
        
        * rdelim.scm (skip-char-set): don't use char-set:s.
        
        fr.scm, glob.scm, here.scm, rdelim.scm,
        rx/parse.scm, rx/posixstr, rx/re.scm, rx/rx-lib.scm, rx/simp.scm,
        rx/spencer.scm: use (srfi srfi-14) and/or (scsh cset-obsolete)
        instead of (scsh char-set).
        
        * init.scm, USAGE, Makefile.am, make-module-list: updated.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-scsh/cset-obsolete.scm?cvsroot=OldCVS&rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-scsh/ChangeLog.diff?cvsroot=OldCVS&tr1=1.69&tr2=1.70&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-scsh/Makefile.am.diff?cvsroot=OldCVS&tr1=1.27&tr2=1.28&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-scsh/USAGE.diff?cvsroot=OldCVS&tr1=1.18&tr2=1.19&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-scsh/fr.scm.diff?cvsroot=OldCVS&tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-scsh/glob.scm.diff?cvsroot=OldCVS&tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-scsh/here.scm.diff?cvsroot=OldCVS&tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-scsh/init.scm.diff?cvsroot=OldCVS&tr1=1.41&tr2=1.42&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-scsh/make-module-list.diff?cvsroot=OldCVS&tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-scsh/rdelim.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.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-scsh/rx/posixstr.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.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-scsh/rx/rx-lib.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/simp.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/spencer.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.69 guile/guile-scsh/ChangeLog:1.70
--- guile/guile-scsh/ChangeLog:1.69     Wed Aug  1 12:12:53 2001
+++ guile/guile-scsh/ChangeLog  Wed Aug  1 13:42:57 2001
@@ -6,10 +6,23 @@
        from char-set.scm.
        (char-letter? char-digit? char-letter+digit? char-iso-control?
        char-symbol?): new from scsh-0.5.3.
-       * init.scm, USAGE, Makefile.am, make-module-list: updated.
-
        * utilities.scm (deprecated-proc): redefined using Guile's deprecation
        mechanism.
+
+       * cset-obsolete.scm: new file from scsh-0.5.3.  defines module
+       (scsh cset-obsolete).   Add reduce-char-set from char-set.scm.
+
+       * char-set.scm: deleted.  (scsh char-set) is replaced by
+       (srfi srfi-14), (scsh char-p) and (scsh cset-obsolete).
+
+       * rdelim.scm (skip-char-set): don't use char-set:s.
+
+       fr.scm, glob.scm, here.scm, rdelim.scm,
+       rx/parse.scm, rx/posixstr, rx/re.scm, rx/rx-lib.scm, rx/simp.scm,
+       rx/spencer.scm: use (srfi srfi-14) and/or (scsh cset-obsolete)
+       instead of (scsh char-set).
+
+       * init.scm, USAGE, Makefile.am, make-module-list: updated.
 
 2001-07-30  Gary Houston  <address@hidden>
 
Index: guile/guile-scsh/Makefile.am
diff -u guile/guile-scsh/Makefile.am:1.27 guile/guile-scsh/Makefile.am:1.28
--- guile/guile-scsh/Makefile.am:1.27   Wed Aug  1 10:22:58 2001
+++ guile/guile-scsh/Makefile.am        Wed Aug  1 13:42:57 2001
@@ -3,7 +3,7 @@
 pkgdatadir = ${datadir}/guile/site/scsh
 
 pkgdata_DATA = alt-syntax.scm ascii.scm awk.scm bitwise.scm \
-       char-set.scm char-p.scm define-foreign-syntax.scm \
+       cset-obsolete.scm char-p.scm define-foreign-syntax.scm \
        defrec.scm ekko.scm errno.scm fdports.scm features.scm \
        fileinfo.scm filesys.scm \
        fluid.scm fname.scm fr.scm glob.scm here.scm \
Index: guile/guile-scsh/USAGE
diff -u guile/guile-scsh/USAGE:1.18 guile/guile-scsh/USAGE:1.19
--- guile/guile-scsh/USAGE:1.18 Wed Aug  1 10:22:58 2001
+++ guile/guile-scsh/USAGE      Wed Aug  1 13:42:57 2001
@@ -63,6 +63,9 @@
 ;; string-fill! string-copy string->list
 (string-any string-every string-tabulate string->list reverse-list->string 
string-join string-copy substring/shared string-copy! string-take 
string-take-right string-drop string-drop-right string-pad string-pad-right 
string-trim string-trim-right string-trim-both string-fill! string-compare 
string-compare-ci string= string<> string< string> string<= string>= string-ci= 
string-ci<> string-ci< string-ci> string-ci<= string-ci>= string-hash 
string-hash-ci string-prefix-length string-prefix-length-ci 
string-suffix-length string-suffix-length-ci string-prefix? string-prefix-ci? 
string-suffix? string-suffix-ci? string-index string-index-right string-skip 
string-skip-right string-count string-contains string-contains-ci string-upcase 
string-upcase! string-downcase string-downcase! string-titlecase 
string-titlecase! string-reverse string-reverse! string-append/shared 
string-concatenate string-concatenate-reverse string-concatenate/shared 
string-concatenate-reverse/shared string-map string-map! string-fold 
string-fold-right string-unfold string-unfold-right string-for-each xsubstring 
string-xcopy! string-replace string-tokenize string-filter string-delete)
 
+(srfi srfi-14)
+(char-set? char-set= char-set<= char-set-hash char-set-cursor char-set-ref 
char-set-cursor-next end-of-char-set? char-set-fold char-set-unfold 
char-set-unfold! char-set-for-each char-set-map char-set-copy char-set 
list->char-set list->char-set! string->char-set string->char-set! 
char-set-filter char-set-filter! ucs-range->char-set ucs-range->char-set! 
->char-set char-set-size char-set-count char-set->list char-set->string 
char-set-contains? char-set-every char-set-any char-set-adjoin char-set-adjoin! 
char-set-delete char-set-delete! char-set-complement char-set-union 
char-set-intersection char-set-difference char-set-xor 
char-set-diff+intersection char-set-complement! char-set-union! 
char-set-intersection! char-set-difference! char-set-xor! 
char-set-diff+intersection! char-set:lower-case char-set:upper-case 
char-set:title-case char-set:letter char-set:digit char-set:letter+digit 
char-set:graphic char-set:printing char-set:whitespace char-set:iso-control 
char-set:punctuation char-set:symbol char-set:hex-digit char-set:blank 
char-set:ascii char-set:empty char-set:full)
+
 modules from guile-scsh
 =======================
 
@@ -119,11 +122,11 @@
 (scsh jar-defrecord)
 (define-record-type define-accessor define-accessors)
 
-(scsh char-set)
-(char:newline char:tab char:page char:return char:space char:vtab char-ascii? 
char-set? char-set-copy char-set= char-set<= char-set-size char-set-adjoin 
char-set-delete char-set-adjoin! char-set-delete! char-set-for-each 
char-set-fold reduce-char-set char-set chars->char-set string->char-set 
ascii-range->char-set predicate->char-set ->char-set char-set-members 
char-set-contains? char-set-every? char-set-any char-set-invert char-set-union 
char-set-intersection char-set-difference char-set-invert! char-set-union! 
char-set-intersection! char-set-difference! char-set:lower-case 
char-set:upper-case char-set:alphabetic char-set:numeric char-set:alphanumeric 
char-set:graphic char-set:printing char-set:whitespace char-set:blank 
char-set:control char-set:punctuation char-set:hex-digit char-set:ascii 
char-set:empty char-set:full char-set:s)
-
 (scsh char-p)
 (char-letter? char-digit? char-letter+digit? char-graphic? char-printing? 
char-blank? char-iso-control? char-punctuation? char-symbol? char-hex-digit? 
char-ascii? char-alphanumeric? char-control?)
+
+(scsh cset-obsolete)
+(char-set-members chars->char-set ascii-range->char-set predicate->char-set 
char-set-every? char-set-any? char-set-invert char-set-invert! reduce-char-set 
char-set:alphabetic char-set:numeric char-set:alphanumeric char-set:control)
 
 (scsh defrec)
 (define-record-discloser define-record)
Index: guile/guile-scsh/fr.scm
diff -u guile/guile-scsh/fr.scm:1.3 guile/guile-scsh/fr.scm:1.4
--- guile/guile-scsh/fr.scm:1.3 Mon Dec  4 15:18:03 2000
+++ guile/guile-scsh/fr.scm     Wed Aug  1 13:42:57 2001
@@ -10,7 +10,8 @@
 (define-module (scsh fr)
   :use-module (ice-9 receive)
   :use-module (scsh let-opt)
-  :use-module (scsh char-set)
+  :use-module (srfi srfi-14)
+  :use-module (scsh cset-obsolete)
   :use-module (scsh rdelim)
   :use-module (scsh rx re)
   :use-module (scsh rx re-low)
Index: guile/guile-scsh/glob.scm
diff -u guile/guile-scsh/glob.scm:1.3 guile/guile-scsh/glob.scm:1.4
--- guile/guile-scsh/glob.scm:1.3       Mon Dec  4 15:18:03 2000
+++ guile/guile-scsh/glob.scm   Wed Aug  1 13:42:57 2001
@@ -15,7 +15,8 @@
   :use-module (scsh rx re-high)
   :use-module (scsh rx re)
   :use-module (scsh utilities)
-  :use-module (scsh char-set)
+  :use-module (srfi srfi-14)
+  :use-module (scsh cset-obsolete)
   :use-module (scsh scsh-condition)
   :use-module (scsh syscalls)
 )
Index: guile/guile-scsh/here.scm
diff -u guile/guile-scsh/here.scm:1.4 guile/guile-scsh/here.scm:1.5
--- guile/guile-scsh/here.scm:1.4       Sat Dec  2 13:01:40 2000
+++ guile/guile-scsh/here.scm   Wed Aug  1 13:42:57 2001
@@ -75,7 +75,7 @@
   :use-module (scsh reading)
   :use-module (scsh features)
   :use-module (ice-9 receive)
-  :use-module (scsh char-set)
+  :use-module (srfi srfi-14)
   :use-module (scsh rdelim))
 ;; export nothing, just install a read macro.
 
Index: guile/guile-scsh/init.scm
diff -u guile/guile-scsh/init.scm:1.41 guile/guile-scsh/init.scm:1.42
--- guile/guile-scsh/init.scm:1.41      Wed Aug  1 10:22:58 2001
+++ guile/guile-scsh/init.scm   Wed Aug  1 13:42:57 2001
@@ -12,6 +12,8 @@
             ;; string-fill! string-copy string->list
             (srfi srfi-13)
 
+            (srfi srfi-14)
+
             (scsh alt-syntax)
             (scsh module-system)
             (scsh let-opt)
@@ -27,7 +29,7 @@
             (scsh primitives)
             (scsh reading)
             (scsh jar-defrecord)
-            (scsh char-set)
+            (scsh cset-obsolete)
             (scsh char-p)
             (scsh defrec)
             (scsh errno)
Index: guile/guile-scsh/make-module-list
diff -u guile/guile-scsh/make-module-list:1.6 
guile/guile-scsh/make-module-list:1.7
--- guile/guile-scsh/make-module-list:1.6       Wed Aug  1 10:22:58 2001
+++ guile/guile-scsh/make-module-list   Wed Aug  1 13:42:57 2001
@@ -22,7 +22,7 @@
         primitives
         reading
         jar-defrecord
-        char-set
+        cset-obsolete
         char-p
         defrec
         errno
Index: guile/guile-scsh/rdelim.scm
diff -u guile/guile-scsh/rdelim.scm:1.8 guile/guile-scsh/rdelim.scm:1.9
--- guile/guile-scsh/rdelim.scm:1.8     Sat Jul  7 08:35:28 2001
+++ guile/guile-scsh/rdelim.scm Wed Aug  1 13:42:57 2001
@@ -6,7 +6,8 @@
 
 (define-module (scsh rdelim)
   :use-module (ice-9 rdelim)
-  :use-module (scsh char-set)
+  :use-module (srfi srfi-14)
+  :use-module (scsh cset-obsolete)
   :use-module (scsh rx re-high)
   :use-module (scsh rx re)
   :use-module (scsh rx re-syntax)
@@ -274,8 +275,8 @@
 
 (define (skip-char-set skip-chars . maybe-port)
   (let* ((port (:optional maybe-port (current-input-port)))
-        (cset (->char-set skip-chars))
-        (scset (char-set:s cset)))
+        (cset (->char-set skip-chars)))
+;       (scset (char-set:s cset)))
 
       (cond ((not (input-port? port))
             (error "Illegal value -- not an input port." port))
Index: guile/guile-scsh/rx/parse.scm
diff -u guile/guile-scsh/rx/parse.scm:1.3 guile/guile-scsh/rx/parse.scm:1.4
--- guile/guile-scsh/rx/parse.scm:1.3   Sat Dec  2 13:01:40 2000
+++ guile/guile-scsh/rx/parse.scm       Wed Aug  1 13:42:57 2001
@@ -46,7 +46,8 @@
 
 (define-module (scsh rx parse)
   :use-module (scsh utilities)
-  :use-module (scsh char-set)
+  :use-module (srfi srfi-14)
+  :use-module (scsh cset-obsolete)
   :use-module (ice-9 receive)
   :use-module (scsh ascii)
   :use-module (scsh rx re-low)
Index: guile/guile-scsh/rx/posixstr.scm
diff -u guile/guile-scsh/rx/posixstr.scm:1.4 
guile/guile-scsh/rx/posixstr.scm:1.5
--- guile/guile-scsh/rx/posixstr.scm:1.4        Sat Jul  7 08:35:28 2001
+++ guile/guile-scsh/rx/posixstr.scm    Wed Aug  1 13:42:57 2001
@@ -56,8 +56,9 @@
 (define-module (scsh rx posixstr)
   :use-module (ice-9 receive)
   :use-module (srfi srfi-13)
+  :use-module (srfi srfi-14)
+  :use-module (scsh cset-obsolete)
   :use-module (scsh utilities)
-  :use-module (scsh char-set)
   :use-module (scsh ascii)
   :use-module (scsh rx re)
   :use-module (scsh rx simp)
Index: guile/guile-scsh/rx/re.scm
diff -u guile/guile-scsh/rx/re.scm:1.4 guile/guile-scsh/rx/re.scm:1.5
--- guile/guile-scsh/rx/re.scm:1.4      Sat Jul  7 08:35:28 2001
+++ guile/guile-scsh/rx/re.scm  Wed Aug  1 13:42:57 2001
@@ -17,11 +17,12 @@
 (define-module (scsh rx re)
   :use-module (ice-9 receive)
   :use-module (srfi srfi-13)
+  :use-module (srfi srfi-14)
+  :use-module (scsh cset-obsolete)
   :use-module (scsh defrec)
   :use-module (scsh jar-defrecord)
   :use-module (scsh rx re-low)
   :use-module (scsh utilities)
-  :use-module (scsh char-set)
   :use-module (scsh rx cond-package))
 
 (begin-deprecated
Index: guile/guile-scsh/rx/rx-lib.scm
diff -u guile/guile-scsh/rx/rx-lib.scm:1.2 guile/guile-scsh/rx/rx-lib.scm:1.3
--- guile/guile-scsh/rx/rx-lib.scm:1.2  Sun Oct 29 11:53:23 2000
+++ guile/guile-scsh/rx/rx-lib.scm      Wed Aug  1 13:42:57 2001
@@ -5,7 +5,8 @@
 
 (define-module (scsh rx rx-lib)
   :use-module (scsh utilities)
-  :use-module (scsh char-set)
+  :use-module (srfi srfi-14)
+  :use-module (scsh cset-obsolete)
   :use-module (scsh ascii)
   :use-module (scsh rx re)
   :use-module (scsh rx cond-package)
Index: guile/guile-scsh/rx/simp.scm
diff -u guile/guile-scsh/rx/simp.scm:1.3 guile/guile-scsh/rx/simp.scm:1.4
--- guile/guile-scsh/rx/simp.scm:1.3    Sat Dec  2 13:01:40 2000
+++ guile/guile-scsh/rx/simp.scm        Wed Aug  1 13:42:57 2001
@@ -35,7 +35,8 @@
   :use-module (ice-9 receive)
   :use-module (scsh rx re)
   :use-module (scsh rx cond-package)
-  :use-module (scsh char-set)
+  :use-module (srfi srfi-14)
+  :use-module (scsh cset-obsolete)
 )
 (export simplify-regexp)
 
Index: guile/guile-scsh/rx/spencer.scm
diff -u guile/guile-scsh/rx/spencer.scm:1.3 guile/guile-scsh/rx/spencer.scm:1.4
--- guile/guile-scsh/rx/spencer.scm:1.3 Sat Dec  2 13:01:40 2000
+++ guile/guile-scsh/rx/spencer.scm     Wed Aug  1 13:42:57 2001
@@ -7,7 +7,8 @@
 
 (define-module (scsh rx spencer)
   :use-module (ice-9 receive)
-  :use-module (scsh char-set)
+  :use-module (srfi srfi-14)
+  :use-module (scsh cset-obsolete)
   :use-module (scsh ascii)
   :use-module (scsh rx re))
 (export posix-string->regexp)