diff --git a/pcl/simple-streams/external-formats/utf-16-be.lisp b/pcl/simple-streams/external-formats/utf-16-be.lisp index 2f95b6d5a62d3c7519ef00bf7976d190e2df1341..07da197cde238d02059047b20cfe5742690b5596 100644 --- a/pcl/simple-streams/external-formats/utf-16-be.lisp +++ b/pcl/simple-streams/external-formats/utf-16-be.lisp @@ -4,7 +4,7 @@ ;;; This code was written by Paul Foley and has been placed in the public ;;; domain. ;;; -(ext:file-comment "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/simple-streams/external-formats/utf-16-be.lisp,v 1.2 2009/06/11 16:04:02 rtoy Rel $") +(ext:file-comment "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/simple-streams/external-formats/utf-16-be.lisp,v 1.3 2009/09/30 16:12:41 rtoy Exp $") (in-package "STREAM") @@ -17,7 +17,7 @@ `(let* ((,c1 ,input) (,c2 ,input) (,code (+ (* 256 ,c1) ,c2))) - (declare (type (integer 0 #xffff) ,code)) + (declare (type lisp:codepoint ,code)) (cond ((lisp::surrogatep ,code :low) (setf ,code +replacement-character-code+)) ((lisp::surrogatep ,code :high) diff --git a/pcl/simple-streams/external-formats/utf-16-le.lisp b/pcl/simple-streams/external-formats/utf-16-le.lisp index e9eae5ff920467363d0c34762c5a71a98724de7b..24d0ca958586c6e435be6e94a5a5b694e1282c48 100644 --- a/pcl/simple-streams/external-formats/utf-16-le.lisp +++ b/pcl/simple-streams/external-formats/utf-16-le.lisp @@ -4,7 +4,7 @@ ;;; This code was written by Paul Foley and has been placed in the public ;;; domain. ;;; -(ext:file-comment "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/simple-streams/external-formats/utf-16-le.lisp,v 1.2 2009/06/11 16:04:02 rtoy Rel $") +(ext:file-comment "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/simple-streams/external-formats/utf-16-le.lisp,v 1.3 2009/09/30 16:12:41 rtoy Exp $") (in-package "STREAM") @@ -16,7 +16,7 @@ `(let* ((,c1 ,input) (,c2 ,input) (,code (+ (* 256 ,c2) ,c1))) - (declare (type (integer 0 #xffff) ,code)) + (declare (type lisp:codepoint ,code)) (cond ((lisp::surrogatep ,code :low) ;; Replace with REPLACEMENT CHARACTER. (setf ,code +replacement-character-code+)) diff --git a/pcl/simple-streams/external-formats/utf-16.lisp b/pcl/simple-streams/external-formats/utf-16.lisp index 6119051f51c0df31b7efecdd7e62b6c544592d4d..fcdce8f6e3e566c4badece12960cd0d8f87ffb55 100644 --- a/pcl/simple-streams/external-formats/utf-16.lisp +++ b/pcl/simple-streams/external-formats/utf-16.lisp @@ -1,7 +1,7 @@ ;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Package: STREAM -*- ;;; ;;; ********************************************************************** -(ext:file-comment "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/simple-streams/external-formats/utf-16.lisp,v 1.3 2009/09/09 15:51:28 rtoy Rel $") +(ext:file-comment "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/simple-streams/external-formats/utf-16.lisp,v 1.4 2009/09/30 16:12:41 rtoy Exp $") (in-package "STREAM") @@ -39,7 +39,7 @@ (+ (* 256 ,c1) ,c2))) (,wd 2)) (declare (type (integer 0 2) ,st) - (type (integer 0 #xffff) ,code)) + (type lisp:codepoint ,code)) ;; Note that if BOM is read, WD will be 2 but 4 octets have ;; actually been read: this is intentional - the returned ;; width tells how much to back up to unread a character, and