From: Christophe Rhodes <csr21@cam.ac.uk>
Date: Thu, 13 Jan 2005 11:07:23 +0000 (+0000)
Subject: 0.8.18.29:
X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=5cf1cf443952f2ec20308b9431af8832b9694f9d;p=sbcl.git

0.8.18.29:
	Fix READ-FROM-STRING's second return value on displaced strings.
	(PFD ansi-tests)
---

diff --git a/NEWS b/NEWS
index d6f00f4..9df9311 100644
--- a/NEWS
+++ b/NEWS
@@ -38,6 +38,8 @@ changes in sbcl-0.8.19 relative to sbcl-0.8.18:
   * fixed some bugs revealed by Paul Dietz' test suite:
     ** the FORMATTER-generated functions for ~V[ conditionals require
        the correct number of arguments.
+    ** READ-FROM-STRING returns the mandated second value when applied
+       to displaced strings.
 
 changes in sbcl-0.8.18 relative to sbcl-0.8.17:
   * new feature: reloading changed shared object files with
diff --git a/src/code/reader.lisp b/src/code/reader.lisp
index f4352e6..8391d6d 100644
--- a/src/code/reader.lisp
+++ b/src/code/reader.lisp
@@ -1461,7 +1461,7 @@
    will take effect."
   (declare (string string))
   
-  (with-array-data ((string string)
+  (with-array-data ((string string :offset-var offset)
 		    (start start)
 		    (end (%check-vector-sequence-bounds string start end)))
     (unless *read-from-string-spares*
@@ -1475,7 +1475,7 @@
 	  (values (if preserve-whitespace
 		      (read-preserving-whitespace stream eof-error-p eof-value)
 		      (read stream eof-error-p eof-value))
-		  (string-input-stream-current stream))
+		  (- (string-input-stream-current stream) offset))
 	(push stream *read-from-string-spares*)))))
 
 ;;;; PARSE-INTEGER
diff --git a/version.lisp-expr b/version.lisp-expr
index 5f7a6f4..ef84804 100644
--- a/version.lisp-expr
+++ b/version.lisp-expr
@@ -17,4 +17,4 @@
 ;;; checkins which aren't released. (And occasionally for internal
 ;;; versions, especially for internal versions off the main CVS
 ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".)
-"0.8.18.28"
+"0.8.18.29"