CMUCL commit: RELEASE-20B-BRANCH src/pcl/simple-streams/external-formats (2 files)

[Raymond Toy]

    Date: Saturday, August 14, 2010 @ 20:01:49
  Author: rtoy
    Path: /project/cmucl/cvsroot/src/pcl/simple-streams/external-formats
     Tag: RELEASE-20B-BRANCH

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

Oops.  Forgot to get the fix for FLUSH-STATE from the trunk.


----------------+
 utf-16-be.lisp |   22 +++++++++++-----------
 utf-16-le.lisp |   22 +++++++++++-----------
 2 files changed, 22 insertions(+), 22 deletions(-)


Index: src/pcl/simple-streams/external-formats/utf-16-be.lisp
diff -u src/pcl/simple-streams/external-formats/utf-16-be.lisp:1.10.4.2 src/pcl/simple-streams/external-formats/utf-16-be.lisp:1.10.4.3
--- src/pcl/simple-streams/external-formats/utf-16-be.lisp:1.10.4.2	Sat Aug 14 19:51:08 2010
+++ src/pcl/simple-streams/external-formats/utf-16-be.lisp	Sat Aug 14 20:01:48 2010
@@ -4,7 +4,7 @@
 ;;; This code was written by Paul Foley and has been placed in the public
 ;;; domain.
 ;;;
-(ext:file-comment "$Header: /project/cmucl/cvsroot/src/pcl/simple-streams/external-formats/utf-16-be.lisp,v 1.10.4.2 2010-08-14 23:51:08 rtoy Exp $")
+(ext:file-comment "$Header: /project/cmucl/cvsroot/src/pcl/simple-streams/external-formats/utf-16-be.lisp,v 1.10.4.3 2010-08-15 00:01:48 rtoy Exp $")
 
 (in-package "STREAM")
 (intl:textdomain "cmucl")
@@ -95,16 +95,16 @@
 	      (,output (ldb (byte 8 0) code))))
        (let ((,c (car ,state)))
 	 (when ,c
-	   (,output (if (lisp::surrogatep ,c)
-			(if ,error
-			    (locally
-				;; No warnings about fdefinition
-				(declare (optimize (ext:inhibit-warnings 3)))
-			      (funcall ,error
-				       "Flushing bare surrogate #x~4,'0X is illegal for UTF-16"
-				       (char-code ,c)))
-			    +replacement-character-code+)
-			,c))))))
+	   (out (if (lisp::surrogatep ,c)
+		    (if ,error
+			(locally
+			    ;; No warnings about fdefinition
+			    (declare (optimize (ext:inhibit-warnings 3)))
+			  (funcall ,error
+				   "Flushing bare surrogate #x~4,'0X is illegal for UTF-16"
+				   (char-code ,c)))
+			+replacement-character-code+)
+		    ,c))))))
   (copy-state (state)
     ;; The state is either NIL or a codepoint, so nothing really
     ;; special is needed to copy it.
Index: src/pcl/simple-streams/external-formats/utf-16-le.lisp
diff -u src/pcl/simple-streams/external-formats/utf-16-le.lisp:1.10.4.2 src/pcl/simple-streams/external-formats/utf-16-le.lisp:1.10.4.3
--- src/pcl/simple-streams/external-formats/utf-16-le.lisp:1.10.4.2	Sat Aug 14 19:51:08 2010
+++ src/pcl/simple-streams/external-formats/utf-16-le.lisp	Sat Aug 14 20:01:48 2010
@@ -4,7 +4,7 @@
 ;;; This code was written by Paul Foley and has been placed in the public
 ;;; domain.
 ;;;
-(ext:file-comment "$Header: /project/cmucl/cvsroot/src/pcl/simple-streams/external-formats/utf-16-le.lisp,v 1.10.4.2 2010-08-14 23:51:08 rtoy Exp $")
+(ext:file-comment "$Header: /project/cmucl/cvsroot/src/pcl/simple-streams/external-formats/utf-16-le.lisp,v 1.10.4.3 2010-08-15 00:01:48 rtoy Exp $")
 
 (in-package "STREAM")
 (intl:textdomain "cmucl")
@@ -96,16 +96,16 @@
 	      (,output (ldb (byte 8 8) code))))
        (let ((,c (car ,state)))
 	 (when ,c
-	   (,output (if (lisp::surrogatep ,c)
-			(if ,error
-			    (locally
-				;; No warnings about fdefinition
-				(declare (optimize (ext:inhibit-warnings 3)))
-			      (funcall ,error
-				       "Flushing bare surrogate #x~4,'0X is illegal for UTF-16"
-				       (char-code ,c)))
-			    +replacement-character-code+)
-			,c))))))
+	   (out (if (lisp::surrogatep ,c)
+		    (if ,error
+			(locally
+			    ;; No warnings about fdefinition
+			    (declare (optimize (ext:inhibit-warnings 3)))
+			  (funcall ,error
+				   "Flushing bare surrogate #x~4,'0X is illegal for UTF-16"
+				   (char-code ,c)))
+			+replacement-character-code+)
+		    ,c))))))
   (copy-state (state)
     ;; The state is either NIL or a codepoint, so nothing really
     ;; special is needed.