From: Christophe R. <cr...@us...> - 2005-02-07 12:41:59
|
Update of /cvsroot/sbcl/sbcl/src/code In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3700/src/code Modified Files: macros.lisp Log Message: 0.8.19.19: Fix bug in WITH-INPUT-FROM-STRING (PFD ansi-tests) ... only update INDEX on normal exit. (Fix from Bryan O'Connor) Index: macros.lisp =================================================================== RCS file: /cvsroot/sbcl/sbcl/src/code/macros.lisp,v retrieving revision 1.42 retrieving revision 1.43 diff -u -d -r1.42 -r1.43 --- macros.lisp 20 Nov 2004 17:04:20 -0000 1.42 +++ macros.lisp 7 Feb 2005 12:41:44 -0000 1.43 @@ -369,9 +369,10 @@ ,(or start 0) ,end))))) ,@decls - (unwind-protect - (progn ,@forms) - (close ,var) + (multiple-value-prog1 + (unwind-protect + (progn ,@forms) + (close ,var)) ,@(when index `((setf ,index (string-input-stream-current ,var))))))))) |