From: Christophe R. <cr...@us...> - 2004-01-20 18:10:27
|
Update of /cvsroot/sbcl/sbcl/contrib/sb-simple-streams In directory sc8-pr-cvs1:/tmp/cvs-serv23386/contrib/sb-simple-streams Modified Files: impl.lisp Log Message: 0.8.7.19: Fix for PEEK-CHAR: whitespace means "according to the readtable", not "static list of characters" ... but that's complicated for efficiency: we need WHITESPACEP defined before peek-char so that it can be expanded inline ... so move peek-charish things into a new later file ... delete unused-by-core WHITESPACE-CHAR-P, and adjust contribs to accomodate this ... also add #\page to sb-aclrepl's static whitespace characters Index: impl.lisp =================================================================== RCS file: /cvsroot/sbcl/sbcl/contrib/sb-simple-streams/impl.lisp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- impl.lisp 30 Nov 2003 17:11:06 -0000 1.3 +++ impl.lisp 20 Jan 2004 18:10:23 -0000 1.4 @@ -953,6 +953,8 @@ (etypecase stream (simple-stream (%peek-char stream peek-type eof-error-p eof-value recursive-p)) + ;; FIXME: Broken on ECHO-STREAM (cf internal implementation?) -- + ;; CSR, 2004-01-19 (ansi-stream (let ((char (%ansi-stream-read-char stream eof-error-p eof-value t))) (cond ((eq char eof-value) char) @@ -967,7 +969,7 @@ (do ((char char (%ansi-stream-read-char stream eof-error-p eof-value t))) ((or (eq char eof-value) - (not (sb-int:whitespace-char-p char))) + (not (sb-impl::whitespacep char))) (unless (eq char eof-value) (%ansi-stream-unread-char char stream)) char))) @@ -987,7 +989,7 @@ ((eq peek-type t) (do ((char (sb-gray:stream-read-char stream) (sb-gray:stream-read-char stream))) - ((or (eq char :eof) (not (sb-int:whitespace-char-p char))) + ((or (eq char :eof) (not (sb-impl::whitespacep char))) (cond ((eq char :eof) (sb-impl::eof-or-lose stream eof-error-p eof-value)) (t |