X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Freader.lisp;h=2eb433ae45ec5d579d45e5012d5240966b4438a5;hb=2c06e3056fe6aa820817a927fa0e840eb7b8edb7;hp=3bcf87814d7693f38881e72ef1d5b157bac67d50;hpb=42702bd5e2af3e0042c9f27372c6f5d92335df12;p=sbcl.git

diff --git a/src/code/reader.lisp b/src/code/reader.lisp
index 3bcf878..2eb433a 100644
--- a/src/code/reader.lisp
+++ b/src/code/reader.lisp
@@ -544,7 +544,9 @@ variables to allow for nested and thread safe reading."
       ((character-decoding-error
         #'(lambda (decoding-error)
             (declare (ignorable decoding-error))
-            (style-warn "Character decoding error in a ;-comment at position ~A reading source file ~A, resyncing." (file-position stream) stream)
+            (style-warn
+             'sb!kernel::character-decoding-error-in-macro-char-comment
+             :position (file-position stream) :stream stream)
             (invoke-restart 'attempt-resync))))
     (let ((stream (in-synonym-of stream)))
       (if (ansi-stream-p stream)
@@ -1521,7 +1523,8 @@ variables to allow for nested and thread safe reading."
   (declare (string string))
   (with-array-data ((string string :offset-var offset)
                     (start start)
-                    (end (%check-vector-sequence-bounds string start end)))
+                    (end end)
+                    :check-fill-pointer t)
     (let ((stream (make-string-input-stream string start end)))
       (values (if preserve-whitespace
                   (read-preserving-whitespace stream eof-error-p eof-value)
@@ -1542,7 +1545,8 @@ variables to allow for nested and thread safe reading."
                        :format-arguments (list string))))
     (with-array-data ((string string :offset-var offset)
                       (start start)
-                      (end (%check-vector-sequence-bounds string start end)))
+                      (end end)
+                      :check-fill-pointer t)
       (let ((index (do ((i start (1+ i)))
                        ((= i end)
                         (if junk-allowed