Update of /cvsroot/scsh/scsh-0.6/scsh
In directory usw-pr-cvs1:/tmp/cvs-serv24090/scsh
Modified Files:
fr.scm glob.scm meta-arg.scm
Log Message:
Rest of Olins merge for SRFI-13 and 14.
Index: fr.scm
===================================================================
RCS file: /cvsroot/scsh/scsh-0.6/scsh/fr.scm,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** fr.scm 1999/09/23 17:46:44 1.2
--- fr.scm 2001/03/23 10:52:08 1.3
***************
*** 319,323 ****
((concat) ; CONCAT-delimiter reader.
! (let ((not-delims (char-set-invert delims)))
(lambda maybe-port
(let* ((p (:optional maybe-port (current-input-port)))
--- 319,323 ----
((concat) ; CONCAT-delimiter reader.
! (let ((not-delims (char-set-complement delims)))
(lambda maybe-port
(let* ((p (:optional maybe-port (current-input-port)))
***************
*** 329,333 ****
((split) ; SPLIT-delimiter reader.
! (let ((not-delims (char-set-invert delims)))
(lambda maybe-port
(let ((p (:optional maybe-port (current-input-port))))
--- 329,333 ----
((split) ; SPLIT-delimiter reader.
! (let ((not-delims (char-set-complement delims)))
(lambda maybe-port
(let ((p (:optional maybe-port (current-input-port))))
Index: glob.scm
===================================================================
RCS file: /cvsroot/scsh/scsh-0.6/scsh/glob.scm,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** glob.scm 1999/09/23 17:46:44 1.2
--- glob.scm 2001/03/23 10:52:08 1.3
***************
*** 151,164 ****
((#\])
(let ((cset (fold (lambda (elt cset)
! (char-set-union
! cset
! (if (char? elt)
! (char-set elt)
! (ascii-range->char-set (char->ascii
(car elt))
! (+ 1
(char->ascii (cdr elt)))))))
! char-set:empty
elts)))
(values (re-char-set (if negate?
! (char-set-invert cset)
cset))
i)))
--- 151,163 ----
((#\])
(let ((cset (fold (lambda (elt cset)
! (if (char? elt)
! (char-set-adjoin! cset elt)
! (ucs-range->char-set! (char->ascii
(car elt))
! (+ 1
(char->ascii (cdr elt)))
! #f cset)))
! (char-set-copy char-set:empty)
elts)))
(values (re-char-set (if negate?
! (char-set-compelment! cset)
cset))
i)))
Index: meta-arg.scm
===================================================================
RCS file: /cvsroot/scsh/scsh-0.6/scsh/meta-arg.scm,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** meta-arg.scm 1999/11/04 17:26:23 1.3
--- meta-arg.scm 2001/03/23 10:52:08 1.4
***************
*** 53,57 ****
(define read-files-secondary-args
! (let ((non-newline (char-set-invert (char-set #\newline))))
(lambda (fname)
(call-with-input-file fname
--- 53,57 ----
(define read-files-secondary-args
! (let ((non-newline (char-set-complement! (char-set #\newline))))
(lambda (fname)
(call-with-input-file fname
|