From: Christophe R. <cr...@us...> - 2005-02-22 10:35:31
|
Update of /cvsroot/sbcl/sbcl/src/code In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18656/src/code Modified Files: condition.lisp Log Message: 0.8.19.36: make FILE-POSITION-FOR-ERROR-OR-NIL understand two-arg FILE-POSITION Index: condition.lisp =================================================================== RCS file: /cvsroot/sbcl/sbcl/src/code/condition.lisp,v retrieving revision 1.59 retrieving revision 1.60 diff -u -d -r1.59 -r1.60 --- condition.lisp 18 Feb 2005 08:22:28 -0000 1.59 +++ condition.lisp 22 Feb 2005 10:34:51 -0000 1.60 @@ -19,7 +19,7 @@ ;;; generally a PITA, so whatever the failure encountered when ;;; wondering about FILE-POSITION within a condition printer, 'tis ;;; better silently to give up than to try to complain. -(defun file-position-or-nil-for-error (stream) +(defun file-position-or-nil-for-error (stream &optional (pos nil posp)) ;; Arguably FILE-POSITION shouldn't be signalling errors at all; but ;; "NIL if this cannot be determined" in the ANSI spec doesn't seem ;; absolutely unambiguously to prohibit errors when, e.g., STREAM @@ -29,7 +29,9 @@ ;; defsystemish operation where the ERROR-STREAM had been CL:CLOSEd, ;; I think by nonlocally exiting through a WITH-OPEN-FILE, by the ;; time an error was reported.) - (ignore-errors (file-position stream))) + (if posp + (ignore-errors (file-position stream pos)) + (ignore-errors (file-position stream)))) ;;;; the CONDITION class |