Changeset 903

Timestamp:

Feb 15, 2005, 11:24:23 PM (20 years ago)

Author:

bryan

Message:

don't update index if with-input-from-string exits abnormally.

File:

• trunk/ccl/lib/macros.lisp (modified) (1 diff)

trunk/ccl/lib/macros.lisp

@@ -1251 +1251 @@
                     `(make-string-input-stream ,string ,(or start 0) ,end)))))
       ,@decls
-      (unwind-protect
-           (progn ,@forms)
-        (close ,var)
-        ,@(if index `((setf ,index (string-input-stream-index ,var))))))))
+      (multiple-value-prog1 (unwind-protect
+                                 (progn ,@forms)
+                              (close ,var))
+        ,@(if index `((setf ,index (string-input-stream-index ,var))))))))
 
 (defmacro with-output-to-string ((var &optional string &key (element-type 'base-char element-type-p))