[cmucl-cvs] [git] CMU Common Lisp branch master updated. snapshot-2012-04-4-g9f6b065

[Raymond Toy]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMU Common Lisp".

The branch, master has been updated
       via  9f6b065b0ea4b758a00fa9b3b790b5ef2bb8853d (commit)
      from  f3db74d49bf24c108053873f06905dbb2ed3cebd (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 9f6b065b0ea4b758a00fa9b3b790b5ef2bb8853d
Author: Raymond Toy <toy.raymond at gmail.com>
Date:   Fri Apr 20 08:41:14 2012 -0700

    Test for state change was wrong.

diff --git a/src/code/stream.lisp b/src/code/stream.lisp
index 92987b7..a91d4d7 100644
--- a/src/code/stream.lisp
+++ b/src/code/stream.lisp
@@ -829,6 +829,7 @@
 		 (flet
 		     ((convert-buffer ()
 			(let ((old-state (fd-stream-oc-state stream)))
+			  (format t "old-state = ~S~%" old-state)
 			  (multiple-value-bind (s char-count octet-count new-state)
 			      (stream::octets-to-string-counted
 			       ibuf
@@ -847,7 +848,6 @@
 			      (format t "char-count = ~A~%" char-count)
 			      (format t "octet-count = ~A~%" octet-count)
 			      (format t "in-index = ~A~%" (lisp-stream-in-index stream))
-			      (format t "old state = ~S~%" old-state)
 			      (format t "new state = ~S~%" new-state))
 			    ;; FIXME: We need to know if a BOM
 			    ;; character was read so that we can
@@ -869,8 +869,9 @@
 			    ;; octet-count by 2 for the BOM because
 			    ;; OCTETS-TO-STRING doesn't include that
 			    ;; in its count.
-			    (when (not (eql (cadr old-state)
-					    (cadr new-state)))
+			    (when (and (consp (cdr new-state))
+				       (not (eql (cadr old-state)
+						 (cadr new-state))))
 			      #+debug-frc-sr
 			      (format t "state changed from ~S to ~S~%" old-state new-state)
 			      ;; See utf-16.lisp and utf-32.lisp to

-----------------------------------------------------------------------

Summary of changes:
 src/code/stream.lisp |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMU Common Lisp