Update of /cvsroot/scsh/scsh/scsh
In directory usw-pr-cvs1:/tmp/cvs-serv19358/scsh
Modified Files:
fr.scm glob.scm meta-arg.scm scsh-interfaces.scm
scsh-package.scm scsh.scm
Log Message:
- Folding the branch that packages up the SRFI 13 & 14 integration changes
into the main trunk.
- Changing EXEC-PATH-LIST from a global var to a fluid. (scsh.scm &
scsh-package.scm). This sort of snuck into this commit.
Index: fr.scm
===================================================================
RCS file: /cvsroot/scsh/scsh/scsh/fr.scm,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** fr.scm 1999/09/08 15:19:16 1.5
--- fr.scm 2001/03/11 18:52:58 1.6
***************
*** 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/scsh/glob.scm,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** glob.scm 2000/02/09 15:21:07 1.5
--- glob.scm 2001/03/11 18:52:58 1.6
***************
*** 152,165 ****
((#\])
(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)))
--- 152,164 ----
((#\])
(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-complement! cset)
cset))
i)))
Index: meta-arg.scm
===================================================================
RCS file: /cvsroot/scsh/scsh/scsh/meta-arg.scm,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** meta-arg.scm 1999/08/06 13:27:59 1.6
--- meta-arg.scm 2001/03/11 18:52:58 1.7
***************
*** 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
Index: scsh-interfaces.scm
===================================================================
RCS file: /cvsroot/scsh/scsh/scsh/scsh-interfaces.scm,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -r1.27 -r1.28
*** scsh-interfaces.scm 2001/02/25 19:51:56 1.27
--- scsh-interfaces.scm 2001/03/11 18:52:58 1.28
***************
*** 685,764 ****
- (define-interface char-set-interface
- (export 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-lower-case?
- char-upper-case?
- char-alphabetic?
- char-numeric?
- char-alphanumeric?
- char-graphic?
- char-printing?
- char-whitespace?
- char-blank?
- char-control?
- char-punctuation?
- char-hex-digit?
- char-ascii?
-
- ;; This is not properly part of the interface,
- ;; and should be moved to an internals interface --
- ;; it is used by rdelim.scm code.
- char-set:s))
-
-
(define-interface scsh-field-reader-interface
! (export join-strings
field-splitter infix-splitter suffix-splitter sloppy-suffix-splitter
record-reader
--- 685,690 ----
(define-interface scsh-field-reader-interface
! (export join-strings ; Obsolete. Has become SRFI-13's STRING-JOIN.
field-splitter infix-splitter suffix-splitter sloppy-suffix-splitter
record-reader
Index: scsh-package.scm
===================================================================
RCS file: /cvsroot/scsh/scsh/scsh/scsh-package.scm,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** scsh-package.scm 2001/02/25 19:51:56 1.16
--- scsh-package.scm 2001/03/11 18:52:58 1.17
***************
*** 62,76 ****
- (define-structure char-set-package char-set-interface
- (open error-package
- ascii
- define-record-types ; JAR's record macro.
- scsh-utilities ; For DEPRECATED-PROC
- scheme)
- (files char-set)
- (optimize auto-integrate)
- )
-
-
(define-structures ((tty-flags tty-flags-interface)
(scsh-internal-tty-flags scsh-internal-tty-flags-interface))
--- 62,65 ----
***************
*** 167,173 ****
weak
; scsh-regexp-package
; scsh-regexp-internals
! char-set-package
scsh-version
tty-flags
--- 156,163 ----
weak
+ scsh-char-set-low-level-lib ; rdelim.scm needs it.
; scsh-regexp-package
; scsh-regexp-internals
! char-set-lib
scsh-version
tty-flags
***************
*** 182,186 ****
string-lib
! loopholes ; For my bogus CALL-TERMINALLY
implementation.
scheme
--- 172,177 ----
string-lib
! fluids ; For exec-path-list
! loopholes ; For my bogus CALL-TERMINALLY implementation.
scheme
***************
*** 289,303 ****
(define-structure field-reader-package scsh-field-reader-interface
(open receiving ; receive
! char-set-package
! scsh-utilities ; nth
error-package ; error
scsh-level-0 ; delimited readers
; scsh-regexp-package
re-exports
- string-lib ; join-strings
let-opt ; optional-arg parsing & defaulting
scheme
)
(files fr)
(optimize auto-integrate)
)
--- 280,296 ----
(define-structure field-reader-package scsh-field-reader-interface
(open receiving ; receive
! scsh-utilities ; nth & deprecated-proc (for join-strings)
error-package ; error
+ string-lib ; string-join for obsolete join-strings
scsh-level-0 ; delimited readers
; scsh-regexp-package
re-exports
let-opt ; optional-arg parsing & defaulting
scheme
)
(files fr)
+ ;; Handle a little bit of backwards compatibility.
+ (begin (define join-strings (deprecated-proc string-join 'join-strings
+ "Use SRFI-13 STRING-JOIN.")))
(optimize auto-integrate)
)
***************
*** 365,371 ****
--- 358,367 ----
awk-interface
odbc-interface
+ char-set-predicates-interface; Urk -- Some of this is
R5RS!
+ obsolete-char-set-interface
)
(open structure-refs
+ obsolete-char-set-lib
scsh-level-0
scsh-level-0-internals
***************
*** 378,381 ****
--- 374,378 ----
odbc-package
field-reader-package
+ char-set-predicates-lib ; Urk -- Some of this is R5RS!
scheme)
Index: scsh.scm
===================================================================
RCS file: /cvsroot/scsh/scsh/scsh/scsh.scm,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** scsh.scm 1999/09/09 21:27:57 1.13
--- scsh.scm 2001/03/11 18:52:58 1.14
***************
*** 665,669 ****
;(define (exec-path/env prog env . arglist)
! ; (cond ((exec-path-search (stringify prog) exec-path-list) =>
; (lambda (binary)
; (apply exec/env binary env arglist)))
--- 665,669 ----
;(define (exec-path/env prog env . arglist)
! ; (cond ((exec-path-search (stringify prog) (fluid exec-path-list)) =>
; (lambda (binary)
; (apply exec/env binary env arglist)))
***************
*** 687,691 ****
(let ((binary (string-append dir "/" prog)))
(%%exec/errno binary argv env)))
! exec-path-list))))
(error "No executable found." prog arglist))
--- 687,691 ----
(let ((binary (string-append dir "/" prog)))
(%%exec/errno binary argv env)))
! (fluid exec-path-list)))))
(error "No executable found." prog arglist))
***************
*** 747,751 ****
;;; Some globals:
(define home-directory "")
! (define exec-path-list '())
(define (init-scsh-vars quietly?)
--- 747,751 ----
;;; Some globals:
(define home-directory "")
! (define exec-path-list (make-fluid '()))
(define (init-scsh-vars quietly?)
***************
*** 755,763 ****
(warn "Starting up with no home directory ($HOME)."))
"/")))
! (set! exec-path-list
! (cond ((getenv "PATH") => split-colon-list)
! (else (if (not quietly?)
! (warn "Starting up with no path ($PATH)."))
! '()))))
--- 755,763 ----
(warn "Starting up with no home directory ($HOME)."))
"/")))
! (set-fluid! exec-path-list
! (cond ((getenv "PATH") => split-colon-list)
! (else (if (not quietly?)
! (warn "Starting up with no path ($PATH)."))
! '()))))
|