[[project @ 2001-08-01 20:42:57 by ghouston] ghouston**20010801204257 Ignore-this: ce0fac55122e158493033769b1c241ae * 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. ] rmfile ./char-set.scm addfile ./cset-obsolete.scm hunk ./ChangeLog 9 - * init.scm, USAGE, Makefile.am, make-module-list: updated. - hunk ./ChangeLog 12 + * 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. + hunk ./Makefile.am 6 - char-set.scm char-p.scm define-foreign-syntax.scm \ + cset-obsolete.scm char-p.scm define-foreign-syntax.scm \ hunk ./USAGE 66 +(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) + hunk ./USAGE 125 -(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) - hunk ./USAGE 128 +(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) + hunk ./cset-obsolete.scm 1 +;;; Support for obsolete, deprecated 0.5.2 char-set procedures. +;;; Will go away in a future release. + +(define-module (scsh cset-obsolete) + :use-module (srfi srfi-14) + :use-module (scsh module-system) + :use-module (scsh utilities)) + +;;(define-interface obsolete-char-set-interface + (export char-set-members ; char-set->list + chars->char-set ; list->char-set + ascii-range->char-set ; ucs-range->char-set (not exact) + predicate->char-set ; char-set-filter (not exact) + ;->char-set ; no longer handles a predicate + char-set-every? ; char-set-every + char-set-any? ; char-set-any + + char-set-invert ; char-set-complement + char-set-invert! ; char-set-complement! + + reduce-char-set ; char-set-fold + + char-set:alphabetic ; char-set:letter + char-set:numeric ; char-set:digit + char-set:alphanumeric ; char-set:letter+digit + char-set:control) ; char-set:iso-control + + +(define-structure obsolete-char-set-lib obsolete-char-set-interface + (open scsh-utilities char-set-lib scheme) + (begin + + (define char-set-members + (deprecated-proc char-set->list 'char-set-members + "Use CHAR-SET->LIST instead.")) + (define chars->char-set + (deprecated-proc list->char-set 'chars->char-set + "Use LIST->CHAR-SET instead.")) + (define ascii-range->char-set + (deprecated-proc (lambda (lower upper) (ucs-range->char-set lower upper #t)) + 'ascii-range->char-set + "Use UCS-RANGE->CHAR-SET instead.")) + (define predicate->char-set + (deprecated-proc (lambda (pred) (char-set-filter pred char-set:full)) + 'predicate->char-set + "Change code to use CHAR-SET-FILTER.")) + (define char-set-every? + (deprecated-proc char-set-every 'char-set-every? + "Use CHAR-SET-EVERY instead.")) + (define char-set-any? + (deprecated-proc char-set-every 'char-set-any? + "Use CHAR-SET-ANY instead.")) + (define char-set-invert + (deprecated-proc char-set-complement 'char-set-invert + "Use CHAR-SET-COMPLEMENT instead.")) + (define char-set-invert! + (deprecated-proc char-set-complement! 'char-set-invert! + "Use CHAR-SET-COMPLEMENT! instead.")) + + (define reduce-char-set (deprecated-proc char-set-fold 'char-set-fold + "Use char-set-fold instead.")) + + (define char-set:alphabetic char-set:letter) + (define char-set:numeric char-set:digit) + (define char-set:alphanumeric char-set:letter+digit) + (define char-set:control char-set:iso-control))) hunk ./fr.scm 13 - :use-module (scsh char-set) + :use-module (srfi srfi-14) + :use-module (scsh cset-obsolete) hunk ./glob.scm 18 - :use-module (scsh char-set) + :use-module (srfi srfi-14) + :use-module (scsh cset-obsolete) hunk ./here.scm 78 - :use-module (scsh char-set) + :use-module (srfi srfi-14) hunk ./init.scm 15 + (srfi srfi-14) + hunk ./init.scm 32 - (scsh char-set) + (scsh cset-obsolete) hunk ./make-module-list 25 - char-set + cset-obsolete hunk ./rdelim.scm 9 - :use-module (scsh char-set) + :use-module (srfi srfi-14) + :use-module (scsh cset-obsolete) hunk ./rdelim.scm 278 - (cset (->char-set skip-chars)) - (scset (char-set:s cset))) + (cset (->char-set skip-chars))) +; (scset (char-set:s cset))) hunk ./rx/parse.scm 49 - :use-module (scsh char-set) + :use-module (srfi srfi-14) + :use-module (scsh cset-obsolete) hunk ./rx/posixstr.scm 59 + :use-module (srfi srfi-14) + :use-module (scsh cset-obsolete) hunk ./rx/posixstr.scm 62 - :use-module (scsh char-set) hunk ./rx/re.scm 20 + :use-module (srfi srfi-14) + :use-module (scsh cset-obsolete) hunk ./rx/re.scm 26 - :use-module (scsh char-set) hunk ./rx/rx-lib.scm 8 - :use-module (scsh char-set) + :use-module (srfi srfi-14) + :use-module (scsh cset-obsolete) hunk ./rx/simp.scm 38 - :use-module (scsh char-set) + :use-module (srfi srfi-14) + :use-module (scsh cset-obsolete) hunk ./rx/spencer.scm 10 - :use-module (scsh char-set) + :use-module (srfi srfi-14) + :use-module (scsh cset-obsolete)