From 464a60d7821a2277392ff369b014f3d3a49d501b Mon Sep 17 00:00:00 2001 From: pw <pw> Date: Sat, 28 Mar 1998 17:11:50 +0000 Subject: [PATCH] Removing simple-condition from the CPL of READER-ERROR broke error processing (should have noticed earlier, dang!). This change puts back the missing parts. --- code/reader.lisp | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/code/reader.lisp b/code/reader.lisp index e139a88c7..89e2d7e4a 100644 --- a/code/reader.lisp +++ b/code/reader.lisp @@ -5,7 +5,7 @@ ;;; Carnegie Mellon University, and has been placed in the public domain. ;;; (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/reader.lisp,v 1.23 1998/03/26 13:20:48 pw Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/reader.lisp,v 1.24 1998/03/28 17:11:50 pw Exp $") ;;; ;;; ********************************************************************** ;;; @@ -42,14 +42,21 @@ ;;;; Reader errors: -(define-condition reader-error (parse-error stream-error) () +(define-condition reader-error (parse-error stream-error) + ((format-control + :reader reader-error-format-control + :initarg :format-control) + (format-arguments + :reader reader-error-format-arguments + :initarg :format-arguments + :initform '())) (:report (lambda (condition stream) (let ((error-stream (stream-error-stream condition))) (format stream "Reader error ~@[at ~D ~]on ~S:~%~?" (file-position error-stream) error-stream - (simple-condition-format-control condition) - (simple-condition-format-arguments condition)))))) + (reader-error-format-control condition) + (reader-error-format-arguments condition)))))) (define-condition reader-package-error (reader-error) ()) -- GitLab