[cmucl-cvs] [git] CMU Common Lisp branch master updated. release-20c-8-g17c9b81

[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  17c9b814e38d6416ab3046effa39e3cba050218d (commit)
       via  8d915bdb5a9fa8a3fe52846ad54affb2b7c264ac (commit)
      from  d4dc2cd1b3f80a3b6ef30eaf7e9741d2208cf676 (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 17c9b814e38d6416ab3046effa39e3cba050218d
Author: Raymond Toy <toy.raymond at gmail.com>
Date:   Thu Nov 3 21:52:46 2011 -0700

    Update from change log.

diff --git a/general-info/release-20d.txt b/general-info/release-20d.txt
index 460cc3c..0c926f7 100644
--- a/general-info/release-20d.txt
+++ b/general-info/release-20d.txt
@@ -23,7 +23,13 @@ New in this release:
   * Feature enhancements
 
   * Changes
-
+    * ASDF2 updated to version 2.018.
+    * Behavior of STRING-TO-OCTETS has changed.  This is an
+      incompatible change from the previous version but should be more
+      useful when a buffer is given which is not large enough to hold
+      all the octets for the given string.  See docstring for more
+      details.
+      
   * ANSI compliance fixes:
 
   * Bugfixes:

commit 8d915bdb5a9fa8a3fe52846ad54affb2b7c264ac
Author: Raymond Toy <toy.raymond at gmail.com>
Date:   Thu Nov 3 21:39:36 2011 -0700

    STRING-TO-OCTETS returns the buffer, the number of octets written and
    the number of characters converted when a buffer is given.  If the
    buffer is not large enough, not all characters are converted.  This is
    an incompatible change from the previous version.
    
    Suggested by Helmut Eller, cmucl-imp, 2011-10-29.

diff --git a/code/extfmts.lisp b/code/extfmts.lisp
index 5936ca7..43adbcc 100644
--- a/code/extfmts.lisp
+++ b/code/extfmts.lisp
@@ -851,39 +851,66 @@ character and illegal outputs are replaced by a question mark.")
       (funcall f state))))
 
 (def-ef-macro ef-string-to-octets (extfmt lisp::lisp +ef-max+ +ef-so+)
-  `(lambda (string start end buffer error &aux (ptr 0) (state nil))
+  `(lambda (string start end buffer buffer-start buffer-end error bufferp
+	    &aux (ptr buffer-start) (state nil) (last-octet buffer-start))
      (declare #|(optimize (speed 3) (safety 0) (space 0) (debug 0))|#
 	      (type simple-string string)
 	      (type kernel:index start end ptr)
 	      (type (simple-array (unsigned-byte 8) (*)) buffer)
 	      (ignorable state))
-    (dotimes (i (- end start) (values buffer ptr))
-      (declare (type kernel:index i))
-      (char-to-octets ,extfmt (schar string (+ start i)) state
-		      (lambda (b)
-			(when (= ptr (length buffer))
-			  (setq buffer (adjust-array buffer (* 2 ptr))))
-			(setf (aref buffer (1- (incf ptr))) b))
-		      error))))
+     (if bufferp
+	 (block ef-string-done
+	   (dotimes (i (- end start) (values buffer ptr i))
+	     (declare (type kernel:index i))
+	     (char-to-octets ,extfmt (schar string (+ start i)) state
+			     (lambda (b)
+			       (when (= ptr buffer-end)
+				 (return-from ef-string-done
+				   (values buffer last-octet i)))
+			       (setf (aref buffer (1- (incf ptr))) b))
+			     error)
+	     (setf last-octet ptr)))
+	 (dotimes (i (- end start) (values buffer ptr i))
+	   (declare (type kernel:index i))
+	   (char-to-octets ,extfmt (schar string (+ start i)) state
+			   (lambda (b)
+			     (when (= ptr (length buffer))
+			       (setq buffer (adjust-array buffer (* 2 ptr))))
+			     (setf (aref buffer (1- (incf ptr))) b))
+			   error)))))
 
 (defun string-to-octets (string &key (start 0) end (external-format :default)
 				     (buffer nil bufferp)
+				     (buffer-start 0)
 			             error)
   "Convert String to octets using the specified External-format.  The
   string is bounded by Start (defaulting to 0) and End (defaulting to
   the end of the string.  If Buffer is given, the octets are stored
-  there.  If not, a new buffer is created."
+  there.  If not, a new buffer is created.  Buffer-start specifies
+  where in the buffer the first octet will be placed.
+
+  Three values are returned: The buffer, the number of valid octets
+  written, and the number of characters converted.  Note that the
+  actual number of octets written may be greater than the returned
+  value, These represent the partial octets of the next character to
+  be converted, but there was not enough room to hold the complete set
+  of octets."
   (declare (type string string)
 	   (type kernel:index start)
 	   (type (or kernel:index null) end)
-	   (type (or (simple-array (unsigned-byte 8) (*)) null) buffer))
+	   (type (or (array (unsigned-byte 8) (*)) null) buffer))
   (let* ((buffer (or buffer (make-array (length string)
 					:element-type '(unsigned-byte 8)))))
-    (multiple-value-bind (buffer ptr)
-	(lisp::with-array-data ((string string) (start start) (end end))
-	  (funcall (ef-string-to-octets external-format)
-		   string start end buffer error))
-      (values (if bufferp buffer (lisp::shrink-vector buffer ptr)) ptr))))
+    (lisp::with-array-data ((b buffer) (b-start)
+			    (b-end))
+      (multiple-value-bind (result ptr octets)
+	  (lisp::with-array-data ((string string) (start start) (end end))
+	    (funcall (ef-string-to-octets external-format)
+		     string start end b
+		     (+ b-start buffer-start) b-end
+		     error bufferp))
+	(values (if bufferp buffer (lisp::shrink-vector result ptr))
+		(- ptr b-start buffer-start) octets)))))
 
 (def-ef-macro ef-octets-to-string (extfmt lisp::lisp +ef-max+ +ef-os+)
   `(lambda (octets ptr end state string s-start s-end error

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

Summary of changes:
 code/extfmts.lisp            |   59 ++++++++++++++++++++++++++++++-----------
 general-info/release-20d.txt |    8 +++++-
 2 files changed, 50 insertions(+), 17 deletions(-)


hooks/post-receive
-- 
CMU Common Lisp