X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Ferror-error.lisp;h=5a0873a94ac65b22f3c10f0babd01dbab53792ab;hb=c7de1989d006e0b3a4f26143b7a81c9bdb754101;hp=59274b5a4c33ccca5d4df0d582ef5c961d3fea73;hpb=a530bbe337109d898d5b4a001fc8f1afa3b5dc39;p=sbcl.git diff --git a/src/code/error-error.lisp b/src/code/error-error.lisp index 59274b5..5a0873a 100644 --- a/src/code/error-error.lisp +++ b/src/code/error-error.lisp @@ -9,9 +9,6 @@ (in-package "SB!IMPL") -(file-comment - "$Header$") - ;;; These specials are used by ERROR-ERROR to track the success of recovery ;;; attempts. (defvar *error-error-depth* 0) @@ -23,18 +20,23 @@ (defun error-error (&rest messages) (let ((*error-error-depth* (1+ *error-error-depth*))) (when (> *error-throw-up-count* 50) + (/show0 "*ERROR-THROW-UP-COUNT* too big, trying HALT") (%primitive sb!c:halt) - (throw 'sb!impl::top-level-catcher nil)) + (/show0 "*ERROR-THROW-UP-COUNT* too big, trying THROW") + (throw 'sb!impl::toplevel-catcher nil)) (case *error-error-depth* (1) (2 (stream-cold-init-or-reset)) (3 (incf *error-throw-up-count*) - (throw 'sb!impl::top-level-catcher nil)) + (/show0 "*ERROR-ERROR-DEPTH* too big, trying THROW") + (throw 'sb!impl::toplevel-catcher nil)) (t + (/show0 "*ERROR-ERROR-DEPTH* too big, trying HALT") (%primitive sb!c:halt) - (throw 'sb!impl::top-level-catcher nil))) + (/show0 "*ERROR-ERROR-DEPTH* too big, trying THROW") + (throw 'sb!impl::toplevel-catcher nil))) (with-standard-io-syntax (let ((*print-readably* nil))