Skip to content
Snippets Groups Projects
Commit 464a60d7 authored by pw's avatar pw
Browse files

Removing simple-condition from the CPL of READER-ERROR broke

error processing (should have noticed earlier, dang!). This
change puts back the missing parts.
parent b980ea9e
No related branches found
No related tags found
No related merge requests found
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
;;; Carnegie Mellon University, and has been placed in the public domain. ;;; Carnegie Mellon University, and has been placed in the public domain.
;;; ;;;
(ext:file-comment (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 @@ ...@@ -42,14 +42,21 @@
;;;; Reader errors: ;;;; 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 (:report
(lambda (condition stream) (lambda (condition stream)
(let ((error-stream (stream-error-stream condition))) (let ((error-stream (stream-error-stream condition)))
(format stream "Reader error ~@[at ~D ~]on ~S:~%~?" (format stream "Reader error ~@[at ~D ~]on ~S:~%~?"
(file-position error-stream) error-stream (file-position error-stream) error-stream
(simple-condition-format-control condition) (reader-error-format-control condition)
(simple-condition-format-arguments condition)))))) (reader-error-format-arguments condition))))))
(define-condition reader-package-error (reader-error) ()) (define-condition reader-package-error (reader-error) ())
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment