CMUCL commit: src/pcl/simple-streams/external-formats (3 files)

[Raymond Toy]

    Date: Saturday, July 3, 2010 @ 09:42:52
  Author: rtoy
    Path: /project/cmucl/cvsroot/src/pcl/simple-streams/external-formats

Modified: utf-32-be.lisp utf-32-le.lisp utf-32.lisp

o Add declaration to get rid of a compiler note.
o SURROGATEP is not exported from LISP.


----------------+
 utf-32-be.lisp |    5 +++--
 utf-32-le.lisp |    5 +++--
 utf-32.lisp    |    5 +++--
 3 files changed, 9 insertions(+), 6 deletions(-)


Index: src/pcl/simple-streams/external-formats/utf-32-be.lisp
diff -u src/pcl/simple-streams/external-formats/utf-32-be.lisp:1.5 src/pcl/simple-streams/external-formats/utf-32-be.lisp:1.6
--- src/pcl/simple-streams/external-formats/utf-32-be.lisp:1.5	Fri Jul  2 19:13:11 2010
+++ src/pcl/simple-streams/external-formats/utf-32-be.lisp	Sat Jul  3 09:42:52 2010
@@ -4,7 +4,7 @@
 ;;; This code was written by Raymond Toy and has been placed in the public
 ;;; domain.
 ;;;
-(ext:file-comment "$Header: /project/cmucl/cvsroot/src/pcl/simple-streams/external-formats/utf-32-be.lisp,v 1.5 2010-07-02 23:13:11 rtoy Exp $")
+(ext:file-comment "$Header: /project/cmucl/cvsroot/src/pcl/simple-streams/external-formats/utf-32-be.lisp,v 1.6 2010-07-03 13:42:52 rtoy Exp $")
 
 (in-package "STREAM")
 
@@ -36,6 +36,7 @@
 
   (code-to-octets (code state output error c i)
     `(flet ((out (,c)
+	      (declare (type (unsigned-byte 32) ,c))
 	      ;; Big-endian output
 	      (dotimes (,i 4)
 		(,output (ldb (byte 8 (* 8 (- 3 ,i))) ,c)))))
@@ -43,7 +44,7 @@
        (unless ,state
 	 (out #xFEFF)
 	 (setf ,state t))
-       (cond ((lisp:surrogatep ,code)
+       (cond ((lisp::surrogatep ,code)
 	      (out (if ,error
 		       (funcall ,error "Surrogate code #x~4,0X is illegal for UTF32 output"
 				,code)
Index: src/pcl/simple-streams/external-formats/utf-32-le.lisp
diff -u src/pcl/simple-streams/external-formats/utf-32-le.lisp:1.5 src/pcl/simple-streams/external-formats/utf-32-le.lisp:1.6
--- src/pcl/simple-streams/external-formats/utf-32-le.lisp:1.5	Fri Jul  2 19:13:12 2010
+++ src/pcl/simple-streams/external-formats/utf-32-le.lisp	Sat Jul  3 09:42:52 2010
@@ -4,7 +4,7 @@
 ;;; This code was written by Raymond Toy and has been placed in the public
 ;;; domain.
 ;;;
-(ext:file-comment "$Header: /project/cmucl/cvsroot/src/pcl/simple-streams/external-formats/utf-32-le.lisp,v 1.5 2010-07-02 23:13:12 rtoy Exp $")
+(ext:file-comment "$Header: /project/cmucl/cvsroot/src/pcl/simple-streams/external-formats/utf-32-le.lisp,v 1.6 2010-07-03 13:42:52 rtoy Exp $")
 
 (in-package "STREAM")
 
@@ -37,10 +37,11 @@
 
   (code-to-octets (code state output error c i)
     `(flet ((out (,c)
+	      (declare (type (unsigned-byte 32) ,c))
 	      ;; Little-endian output
 	      (dotimes (,i 4)
 		(,output (ldb (byte 8 (* 8 ,i)) ,c)))))
-       (cond ((lisp:surrogatep ,code)
+       (cond ((lisp::surrogatep ,code)
 	      (out (if ,error
 		       (funcall ,error "Surrogate code #x~4,0X is illegal for UTF32 output"
 				,code)
Index: src/pcl/simple-streams/external-formats/utf-32.lisp
diff -u src/pcl/simple-streams/external-formats/utf-32.lisp:1.7 src/pcl/simple-streams/external-formats/utf-32.lisp:1.8
--- src/pcl/simple-streams/external-formats/utf-32.lisp:1.7	Fri Jul  2 19:13:12 2010
+++ src/pcl/simple-streams/external-formats/utf-32.lisp	Sat Jul  3 09:42:52 2010
@@ -4,7 +4,7 @@
 ;;; This code was written by Raymond Toy and has been placed in the public
 ;;; domain.
 ;;;
-(ext:file-comment "$Header: /project/cmucl/cvsroot/src/pcl/simple-streams/external-formats/utf-32.lisp,v 1.7 2010-07-02 23:13:12 rtoy Exp $")
+(ext:file-comment "$Header: /project/cmucl/cvsroot/src/pcl/simple-streams/external-formats/utf-32.lisp,v 1.8 2010-07-03 13:42:52 rtoy Exp $")
 
 (in-package "STREAM")
 
@@ -78,6 +78,7 @@
 
   (code-to-octets (code state output error i c)
     `(flet ((out (,c)
+	      (declare (type (unsigned-byte 32) ,c))
 	      ;; Big-endian output
 	      (dotimes (,i 4)
 		(,output (ldb (byte 8 (* 8 (- 3 ,i))) ,c)))))
@@ -85,7 +86,7 @@
        (unless ,state
 	 (out #xFEFF)
 	 (setf ,state t))
-       (cond ((lisp:surrogatep ,code)
+       (cond ((lisp::surrogatep ,code)
 	      (out (if ,error
 		       (funcall ,error "Surrogate code #x~4,0X is illegal for UTF32 output"
 				,code)