0.9.6.22:

[sbcl.git] / src / code / fd-stream.lisp

diff --git a/src/code/fd-stream.lisp b/src/code/fd-stream.lisp
index 945790e..6e2b2b4 100644 (file)
--- a/src/code/fd-stream.lisp
+++ b/src/code/fd-stream.lisp
@@ -502,15 +502,26 @@
         (end (or end (length (the vector thing)))))
     (declare (fixnum start end))
     (if (stringp thing)
         (end (or end (length (the vector thing)))))
     (declare (fixnum start end))
     (if (stringp thing)

-        (let ((last-newline (and (find #\newline (the simple-string thing)
-                                       :start start :end end)
-                                 ;; FIXME why do we need both calls?
-                                 ;; Is find faster forwards than
-                                 ;; position is backwards?
-                                 (position #\newline (the simple-string thing)
-                                           :from-end t
-                                           :start start
-                                           :end end))))
+        (let ((last-newline
+               (flet ((do-it (string)
+                        (and (find #\newline string :start start :end end)
+                             ;; FIXME why do we need both calls?
+                             ;; Is find faster forwards than
+                             ;; position is backwards?
+                             (position #\newline string
+                                       :from-end t
+                                       :start start
+                                       :end end))))
+                 (declare (inline do-it))
+                 ;; Specialize the common cases
+                 (etypecase thing
+                   (simple-base-string
+                    (do-it (the simple-base-string thing)))
+                   #!+sb-unicode
+                   ((simple-array character)
+                    (do-it (the (simple-array character) thing)))
+                   (string
+                    (do-it thing))))))

           (if (and (typep thing 'base-string)
                    (eq (fd-stream-external-format stream) :latin-1))
               (ecase (fd-stream-buffering stream)
           (if (and (typep thing 'base-string)
                    (eq (fd-stream-external-format stream) :latin-1))
               (ecase (fd-stream-buffering stream)

@@ -988,27 +999,34 @@
                      (> (fd-stream-ibuf-tail stream)
                         (fd-stream-ibuf-head stream)))
             (file-position stream (file-position stream)))
                      (> (fd-stream-ibuf-tail stream)
                         (fd-stream-ibuf-head stream)))
             (file-position stream (file-position stream)))

-          (when (< end start)
-            (error ":END before :START!"))
+          (unless (<= 0 start end (length string))
+            (signal-bounding-indices-bad-error string start end))

           (do ()
               ((= end start))
             (setf (fd-stream-obuf-tail stream)
                   (flet ((do-it (string)
           (do ()
               ((= end start))
             (setf (fd-stream-obuf-tail stream)
                   (flet ((do-it (string)

-                           (do* ((len (fd-stream-obuf-length stream))
+                           (let ((len (fd-stream-obuf-length stream))

                                  (sap (fd-stream-obuf-sap stream))
                                  (tail (fd-stream-obuf-tail stream)))
                                  (sap (fd-stream-obuf-sap stream))
                                  (tail (fd-stream-obuf-tail stream)))

-                                ((or (= start end) (< (- len tail) 4)) tail)
-                             ,(if output-restart
-                                  `(catch 'output-nothing
+                             (declare (type index tail)
+                                      ;; STRING bounds have already been checked.
+                                      (optimize (safety 0)))
+                             (loop
+                                (,@(if output-restart
+                                       `(catch 'output-nothing)
+                                       `(progn))
+                                   (do* ()
+                                        ((or (= start end) (< (- len tail) 4)))

                                      (let* ((byte (aref string start))
                                             (bits (char-code byte)))
                                        ,out-expr
                                      (let* ((byte (aref string start))
                                             (bits (char-code byte)))
                                        ,out-expr

-                                       (incf tail ,size)))
-                                  `(let* ((byte (aref string start))
-                                          (bits (char-code byte)))
-                                     ,out-expr
-                                     (incf tail ,size)))
-                             (incf start))))
+                                       (incf tail ,size)
+                                       (incf start)))
+                                   ;; Exited from the loop normally
+                                   (return-from do-it tail))
+                                ;; Exited via CATCH. Skip the current character
+                                ;; and try the inner loop again.
+                                (incf start)))))

                     (declare (inline do-it))
                     ;; Specialized versions for the common cases of
                     ;; SIMPLE-BASE-STRING and (SIMPLE-ARRAY CHARACTER)
                     (declare (inline do-it))
                     ;; Specialized versions for the common cases of
                     ;; SIMPLE-BASE-STRING and (SIMPLE-ARRAY CHARACTER)

@@ -1108,29 +1126,35 @@
                      (> (fd-stream-ibuf-tail stream)
                         (fd-stream-ibuf-head stream)))
             (file-position stream (file-position stream)))
                      (> (fd-stream-ibuf-tail stream)
                         (fd-stream-ibuf-head stream)))
             (file-position stream (file-position stream)))

-          (when (< end start)
-            (error ":END before :START!"))
+          (unless (<= 0 start end (length string))
+            (signal-bounding-indices-bad-error string start end))

           (do ()
               ((= end start))
             (setf (fd-stream-obuf-tail stream)
                   (flet ((do-it (string)
           (do ()
               ((= end start))
             (setf (fd-stream-obuf-tail stream)
                   (flet ((do-it (string)

-                           (do* ((len (fd-stream-obuf-length stream))
+                           (let ((len (fd-stream-obuf-length stream))

                                  (sap (fd-stream-obuf-sap stream))
                                  (tail (fd-stream-obuf-tail stream)))
                                  (sap (fd-stream-obuf-sap stream))
                                  (tail (fd-stream-obuf-tail stream)))

-                                ((or (= start end) (< (- len tail) 4)) tail)
-                             ,(if output-restart
-                                  `(catch 'output-nothing
+                             (declare (type index tail)
+                                      ;; STRING bounds have already been checked.
+                                      (optimize (safety 0)))
+                             (loop
+                                (,@(if output-restart
+                                       `(catch 'output-nothing)
+                                       `(progn))
+                                   (do* ()
+                                        ((or (= start end) (< (- len tail) 4)))

                                      (let* ((byte (aref string start))
                                             (bits (char-code byte))
                                             (size ,out-size-expr))
                                        ,out-expr
                                      (let* ((byte (aref string start))
                                             (bits (char-code byte))
                                             (size ,out-size-expr))
                                        ,out-expr

-                                       (incf tail size)))
-                                  `(let* ((byte (aref string start))
-                                          (bits (char-code byte))
-                                          (size ,out-size-expr))
-                                     ,out-expr
-                                     (incf tail size)))
-                             (incf start))))
+                                       (incf tail size)
+                                       (incf start)))
+                                   ;; Exited from the loop normally
+                                   (return-from do-it tail))
+                                ;; Exited via CATCH. Skip the current character
+                                ;; and try the inner loop again.
+                                (incf start)))))

                     (declare (inline do-it))
                     ;; Specialized versions for the common cases of
                     ;; SIMPLE-BASE-STRING and (SIMPLE-ARRAY CHARACTER)
                     (declare (inline do-it))
                     ;; Specialized versions for the common cases of
                     ;; SIMPLE-BASE-STRING and (SIMPLE-ARRAY CHARACTER)

@@ -1180,7 +1204,6 @@
           (let* ((head (fd-stream-ibuf-head stream))
                  (tail (fd-stream-ibuf-tail stream))
                  (sap (fd-stream-ibuf-sap stream))
           (let* ((head (fd-stream-ibuf-head stream))
                  (tail (fd-stream-ibuf-tail stream))
                  (sap (fd-stream-ibuf-sap stream))

-                 (head-start head)

                  (decode-break-reason nil))
             (declare (type index head tail))
             ;; Copy data from stream buffer into user's buffer.
                  (decode-break-reason nil))
             (declare (type index head tail))
             ;; Copy data from stream buffer into user's buffer.

@@ -1197,8 +1220,15 @@
                         (incf head size))
                       nil))
               (setf (fd-stream-ibuf-head stream) head)
                         (incf head size))
                       nil))
               (setf (fd-stream-ibuf-head stream) head)

-              (when (and decode-break-reason
-                         (= head head-start))
+              (when decode-break-reason
+                ;; If we've already read some characters on when the invalid
+                ;; code sequence is detected, we return immediately. The
+                ;; handling of the error is deferred until the next call
+                ;; (where this check will be false). This allows establishing
+                ;; high-level handlers for decode errors (for example
+                ;; automatically resyncing in Lisp comments).
+                (when (plusp total-copied)
+                  (return-from ,in-function total-copied))

                 (when (stream-decoding-error-and-handle
                        stream decode-break-reason)
                   (if eof-error-p
                 (when (stream-decoding-error-and-handle
                        stream decode-break-reason)
                   (if eof-error-p