Update of /project/cxml/cvsroot/cxml/runes In directory common-lisp.net:/tmp/cvs-serv7660/runes

Modified Files: ystream.lisp Log Message: sb-unicode backport

Date: Thu Dec 29 01:38:00 2005 Author: dlichteblau

Index: cxml/runes/ystream.lisp diff -u cxml/runes/ystream.lisp:1.2 cxml/runes/ystream.lisp:1.3 --- cxml/runes/ystream.lisp:1.2 Thu Dec 29 01:31:34 2005 +++ cxml/runes/ystream.lisp Thu Dec 29 01:37:59 2005 @@ -76,7 +76,7 @@ (when (plusp ptr) (let* ((in (ystream-in-buffer ystream)) (out (ystream-out-buffer ystream)) - (surrogatep (<= #xD800 (elt in (1- ptr)) #xDBFF)) + (surrogatep (<= #xD800 (rune-code (elt in (1- ptr))) #xDBFF)) n) (when surrogatep (decf ptr)) @@ -179,11 +179,11 @@ (:conc-name "YSTREAM-")) (target-stream nil))

- (defmethod flush-ystream ((ystream rod-ystream)) + (defmethod flush-ystream ((ystream character-stream-ystream)) (write-string (ystream-in-buffer ystream) (ystream-target-stream ystream)) (setf (ystream-in-ptr ystream) 0))

- (defmethod close-ystream ((ystream rod-ystream)) + (defmethod close-ystream ((ystream character-stream-ystream)) (ystream-target-stream ystream)))