Update of /cvsroot/scsh/scsh-0.6/scsh
In directory usw-pr-cvs1:/tmp/cvs-serv7708/scsh
Modified Files:
event.scm scsh-interfaces.scm scsh-package.scm
Log Message:
* New package definitions now that we have SRFI-13 and 14
* Introduced the nomenclature "sigevent"
Index: event.scm
===================================================================
RCS file: /cvsroot/scsh/scsh-0.6/scsh/event.scm,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** event.scm 2001/01/09 15:52:52 1.7
--- event.scm 2001/03/23 12:45:31 1.8
***************
*** 3,16 ****
;;; Extend the functions of the RTS
! (define (wait-interrupt type pre-event)
! (rts-wait-interrupt type pre-event eq?))
! (define (wait-interrupt-set set pre-event)
! (rts-wait-interrupt set pre-event interrupt-in-set?))
! (define (maybe-wait-interrupt type pre-event)
! (rts-maybe-wait-interrupt type pre-event eq?))
! (define (maybe-wait-interrupt-set set pre-event)
! (rts-maybe-wait-interrupt set pre-event interrupt-in-set?))
--- 3,24 ----
;;; Extend the functions of the RTS
! (define (next-sigevent pre-event type)
! (if (not (sigevent? pre-event))
! (error "pre-event is not an event"))
! (rts-next-sigevent pre-event type eq?))
! (define (next-sigevent-set pre-event set)
! (if (not (sigevent? pre-event))
! (error "pre-event is not an event"))
! (rts-next-sigevent pre-event set interrupt-in-set?))
! (define (next-sigevent/no-wait pre-event type)
! (if (not (sigevent? pre-event))
! (error "pre-event is not an event"))
! (rts-next-sigevent/no-wait pre-event type eq?))
! (define (next-sigevent-set/no-wait set pre-event)
! (if (not (sigevent? pre-event))
! (error "pre-event is not an event"))
! (rts-next-sigevent/no-wait pre-event set interrupt-in-set?))
Index: scsh-interfaces.scm
===================================================================
RCS file: /cvsroot/scsh/scsh-0.6/scsh/scsh-interfaces.scm,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** scsh-interfaces.scm 2001/01/09 15:52:52 1.14
--- scsh-interfaces.scm 2001/03/23 12:45:31 1.15
***************
*** 316,320 ****
autoreap-policy
! install-autoreaping
reap-zombies
--- 316,320 ----
autoreap-policy
! with-autoreaping
reap-zombies
***************
*** 702,779 ****
- (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
--- 702,705 ----
***************
*** 1076,1080 ****
interrupt-handlers-vector ; JMG: replaces vm vector
! %install-scsh-handlers
(with-enabled-interrupts :syntax)
--- 1002,1006 ----
interrupt-handlers-vector ; JMG: replaces vm vector
! with-scsh-sighandlers
(with-enabled-interrupts :syntax)
***************
*** 1112,1125 ****
(define-interface scsh-events-interface
! (export most-recent-event
!
! event?
! next-event
! event-type
!
! wait-interrupt
! wait-interrupt-set
! maybe-wait-interrupt
! maybe-wait-interrupt-set))
(define-interface low-interrupt-interface
--- 1038,1049 ----
(define-interface scsh-events-interface
! (export most-recent-sigevent
! sigevent?
! next-sigevent
! next-sigevent-set
! next-sigevent/no-wait
! next-sigevent-set/no-wait
! sigevent-type))
!
(define-interface low-interrupt-interface
***************
*** 1161,1173 ****
(export openlog
syslog
closelog
syslog-option/default
! syslog-option/cons
! syslog-option/ndelay
! syslog-option/pid
! syslog-facility/default
! syslog-facility/auth
syslog-facility/daemon
! syslog-facility/kern
syslog-facility/local0
syslog-facility/local1
--- 1085,1097 ----
(export openlog
syslog
+ syslog-w/id
closelog
syslog-option/default
! syslog-option/console-on-error
! syslog-option/open-now
! syslog-option/include-pid
! syslog-facility/authorisation
syslog-facility/daemon
! syslog-facility/kernel
syslog-facility/local0
syslog-facility/local1
***************
*** 1182,1189 ****
syslog-facility/user
syslog-level/default
! syslog-level/emerg
syslog-level/alert
! syslog-level/crit
! syslog-level/err
syslog-level/warning
syslog-level/notice
--- 1106,1113 ----
syslog-facility/user
syslog-level/default
! syslog-level/emergency
syslog-level/alert
! syslog-level/critical
! syslog-level/error
syslog-level/warning
syslog-level/notice
Index: scsh-package.scm
===================================================================
RCS file: /cvsroot/scsh/scsh-0.6/scsh/scsh-package.scm,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** scsh-package.scm 2001/03/11 18:58:54 1.16
--- scsh-package.scm 2001/03/23 12:45:31 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,66 ----
***************
*** 143,147 ****
)
(for-syntax (open scsh-syntax-helpers scheme))
! (access events scsh-events)
(open enumerated
defenum-package
--- 133,137 ----
)
(for-syntax (open scsh-syntax-helpers scheme))
! (access sigevents scsh-events)
(open enumerated
defenum-package
***************
*** 151,154 ****
--- 141,145 ----
receiving
defrec-package
+ define-record-types
define-foreign-syntax
formats
***************
*** 170,176 ****
weak
; scsh-regexp-package
; scsh-regexp-internals
! char-set-package
scsh-version
tty-flags
--- 161,168 ----
weak
+ scsh-char-set-low-level-lib ; rdelim.scm needs it.
; scsh-regexp-package
; scsh-regexp-internals
! char-set-lib
scsh-version
tty-flags
***************
*** 292,296 ****
(open command-processor
command-levels ; with-new-session
- char-set-package
ensures-loaded
environments
--- 284,287 ----
***************
*** 320,335 ****
(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))
--- 311,329 ----
(define-structure field-reader-package scsh-field-reader-interface
! (open receiving ; receive
! scsh-utilities ; nth
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.")))
! )
***************
*** 376,382 ****
--- 370,379 ----
(export repl)
awk-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
***************
*** 388,391 ****
--- 385,389 ----
awk-package
field-reader-package
+ char-set-predicates-lib ; Urk -- Some of this is R5RS!
dot-locking
scheme)
***************
*** 409,413 ****
structure-refs
low-interrupt
! events)
(files event))
--- 407,411 ----
structure-refs
low-interrupt
! sigevents)
(files event))
|