From a8709a851b09f7fd489c5cd7a71bee73f9e1cf9a Mon Sep 17 00:00:00 2001 From: William Harold Newman Date: Fri, 26 Oct 2007 12:48:14 +0000 Subject: [PATCH] 1.0.11.3: belatedly recognizing STREAM-ERROR and PARSE-ERROR printing is OK * (In my 1.0.9.60 patch, I fixed a READER-ERROR printing bug and wrote that parallel PARSE-ERROR and STREAM-ERROR printing bugs remained and that I would fix them. Now finally returning to fix them, I find that they were fixed already, the tests work with with no additional fixes needed.) * so I just un-#+NILed-out the tests * also made a few trivial rearrangements in src/code/condition.lisp, moving things around without changing meaning --- src/code/condition.lisp | 8 ++++---- tests/condition.impure.lisp | 10 +++------- version.lisp-expr | 2 +- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/src/code/condition.lisp b/src/code/condition.lisp index 5b406e0..f9184fb 100644 --- a/src/code/condition.lisp +++ b/src/code/condition.lisp @@ -619,9 +619,6 @@ (define-condition simple-error (simple-condition error) ()) -;;; not specified by ANSI, but too useful not to have around. -(define-condition simple-style-warning (simple-condition style-warning) ()) - (define-condition storage-condition (serious-condition) ()) (define-condition type-error (error) @@ -634,6 +631,8 @@ (type-error-datum condition) (type-error-expected-type condition))))) +;;; not specified by ANSI, but too useful not to have around. +(define-condition simple-style-warning (simple-condition style-warning) ()) (define-condition simple-type-error (simple-condition type-error) ()) (define-condition program-error (error) ()) @@ -815,7 +814,8 @@ .~:@>" '((fmakunbound 'compile)))))) -(define-condition simple-storage-condition (storage-condition simple-condition) ()) +(define-condition simple-storage-condition (storage-condition simple-condition) + ()) ;;; a condition for use in stubs for operations which aren't supported ;;; on some platforms diff --git a/tests/condition.impure.lisp b/tests/condition.impure.lisp index e21854c..f7ea61a 100644 --- a/tests/condition.impure.lisp +++ b/tests/condition.impure.lisp @@ -102,13 +102,9 @@ :stream *standard-input*))) ;; should be printable (dolist (c (list - ;; but not yet, o lord (should be fixed soon by WHN, in - ;; one or more commits ca. 1.0.9.55+, #+NILed out 'til - ;; then) - #+nil my-stream-error-1-0-9 - #+nil parse-foo-error-1-0-9 - ;; fixed, hallelujah + my-stream-error-1-0-9 + parse-foo-error-1-0-9 read-foo-error-1-0-9)) - ;; escaped or not + ;; whether escaped or not (dolist (*print-escape* '(nil t)) (write c :stream (make-string-output-stream))))) diff --git a/version.lisp-expr b/version.lisp-expr index 9fc5149..f5b9a31 100644 --- a/version.lisp-expr +++ b/version.lisp-expr @@ -17,4 +17,4 @@ ;;; checkins which aren't released. (And occasionally for internal ;;; versions, especially for internal versions off the main CVS ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".) -"1.0.11.2" +"1.0.11.3" -- 1.7.10.4