X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcode%2Fcondition.lisp;h=81a0ce711e27e21001732717a02d8445a17a4c60;hb=4f0bd9304dfa5010e2c7f17d7cecde0bba6c578e;hp=89ae144f169a93ea917b22859147f3061af0f6d9;hpb=f46b52e0ab5b5a8cdfd0ddabed9ff37a9876506e;p=sbcl.git diff --git a/src/code/condition.lisp b/src/code/condition.lisp index 89ae144..81a0ce7 100644 --- a/src/code/condition.lisp +++ b/src/code/condition.lisp @@ -446,8 +446,6 @@ (dolist (initarg (condition-slot-initargs slot) nil) (when (functionp (third (assoc initarg e-def-initargs))) (return t)))) - ;; TODO temp - (assert (not (member slot (condition-classoid-hairy-slots class)))) (push slot (condition-classoid-hairy-slots class))))))) (when (boundp '*define-condition-hooks*) (dolist (fun *define-condition-hooks*) @@ -625,7 +623,9 @@ (type-error-expected-type condition))))) (def!method print-object ((condition type-error) stream) - (if *print-escape* + (if (and *print-escape* + (slot-boundp condition 'expected-type) + (slot-boundp condition 'datum)) (flet ((maybe-string (thing) (ignore-errors (write-to-string thing :lines 1 :readably nil :array nil :pretty t))))