X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fcold-error.lisp;h=e4e094c95bf9d21bb4a1e160d8585017b1c47a2f;hb=82cd148d729c241e79c8df04b700beec1b7c55de;hp=5dbdf5fd1046c40d7efd91db6e113b6539ad389a;hpb=ed2e811980a924df922505d6cc52fef8c76d85b5;p=sbcl.git diff --git a/src/code/cold-error.lisp b/src/code/cold-error.lisp index 5dbdf5f..e4e094c 100644 --- a/src/code/cold-error.lisp +++ b/src/code/cold-error.lisp @@ -16,27 +16,23 @@ "When (TYPEP condition *BREAK-ON-SIGNALS*) is true, then calls to SIGNAL will enter the debugger prior to signalling that condition.") -(defun signal (datum &rest arguments) - #!+sb-doc - "Invokes the signal facility on a condition formed from DATUM and - ARGUMENTS. If the condition is not handled, NIL is returned. If - (TYPEP condition *BREAK-ON-SIGNALS*) is true, the debugger is invoked - before any signalling is done." - (let ((condition (coerce-to-condition datum - arguments - 'simple-condition - 'signal)) - (*handler-clusters* *handler-clusters*) - (old-bos *break-on-signals*)) +(defun maybe-break-on-signal (condition) + (let ((old-bos *break-on-signals*) + (bos-actually-breaking nil)) (restart-case - (when (typep condition *break-on-signals*) - (let ((*break-on-signals* nil)) - (break "~A~%BREAK was entered because of *BREAK-ON-SIGNALS* ~ + (let ((break-on-signals *break-on-signals*) + (*break-on-signals* nil)) + ;; The rebinding encloses the TYPEP so that a bogus + ;; type specifier will not lead to infinite recursion when + ;; TYPEP fails. + (when (typep condition break-on-signals) + (setf bos-actually-breaking t) + (break "~A~%BREAK was entered because of *BREAK-ON-SIGNALS* ~ (now rebound to NIL)." - condition))) + condition))) ;; Give the user a chance to unset *BREAK-ON-SIGNALS* on the ;; way out. - ;; + ;; ;; (e.g.: Consider a long compilation. After a failed compile ;; the user sets *BREAK-ON-SIGNALS* to T, and select the ;; RECOMPILE restart. Once the user diagnoses and fixes the @@ -44,46 +40,58 @@ ;; he's entered the *BREAK-ON-SIGNALS* hell with no escape, ;; unless we provide this restart.) (reassign (new-value) - :report - "Return from BREAK and assign a new value to *BREAK-ON-SIGNALS*." - :interactive - (lambda () - (let (new-value) - (loop - (format *query-io* - "Enter new value for *BREAK-ON-SIGNALS*. ~ - Current value is ~S.~%~ - > " - old-bos) - (force-output *query-io*) - (let ((*break-on-signals* nil)) - (setf new-value (eval (read *query-io*))) - (if (typep new-value 'type-specifier) - (return) - (format *query-io* - "~S is not a valid value for *BREAK-ON-SIGNALS* ~ - (must be a type-specifier).~%" - new-value)))) - (list new-value))) - (setf *break-on-signals* new-value))) + :report + (lambda (stream) + (format stream + (if bos-actually-breaking + "Return from BREAK and assign a new value to ~ + *BREAK-ON-SIGNALS*." + "Assign a new value to *BREAK-ON-SIGNALS* and ~ + continue with signal handling."))) + :interactive + (lambda () + (let (new-value) + (loop + (format *query-io* + "Enter new value for *BREAK-ON-SIGNALS*. ~ + Current value is ~S.~%~ + > " + old-bos) + (force-output *query-io*) + (let ((*break-on-signals* nil)) + (setf new-value (eval (read *query-io*))) + (if (typep new-value 'type-specifier) + (return) + (format *query-io* + "~S is not a valid value for *BREAK-ON-SIGNALS* ~ + (must be a type-specifier).~%" + new-value)))) + (list new-value))) + (setf *break-on-signals* new-value))))) + +(defun signal (datum &rest arguments) + #!+sb-doc + "Invokes the signal facility on a condition formed from DATUM and + ARGUMENTS. If the condition is not handled, NIL is returned. If + (TYPEP condition *BREAK-ON-SIGNALS*) is true, the debugger is invoked + before any signalling is done." + (let ((condition (coerce-to-condition datum + arguments + 'simple-condition + 'signal)) + (*handler-clusters* *handler-clusters*) + (sb!debug:*stack-top-hint* (or sb!debug:*stack-top-hint* 'signal))) + (when *break-on-signals* + (maybe-break-on-signal condition)) (loop (unless *handler-clusters* - (return)) + (return)) (let ((cluster (pop *handler-clusters*))) - (dolist (handler cluster) - (when (typep condition (car handler)) - (funcall (cdr handler) condition))))) + (dolist (handler cluster) + (when (typep condition (car handler)) + (funcall (cdr handler) condition))))) nil)) -;;; a shared idiom in ERROR, CERROR, and BREAK: The user probably -;;; doesn't want to hear that the error "occurred in" one of these -;;; functions, so we try to point the top of the stack to our caller -;;; instead. -(eval-when (:compile-toplevel :execute) - (defmacro-mundanely maybe-find-stack-top-hint () - `(or sb!debug:*stack-top-hint* - (nth-value 1 (find-caller-name-and-frame))))) - (defun error (datum &rest arguments) #!+sb-doc "Invoke the signal facility on a condition formed from DATUM and ARGUMENTS. @@ -93,33 +101,31 @@ (/show0 "cold-printing ERROR arguments one by one..") #!+sb-show (dolist (argument arguments) - (sb!impl::cold-print argument)) + (sb!impl::cold-print argument)) (/show0 "done cold-printing ERROR arguments") (infinite-error-protect (let ((condition (coerce-to-condition datum arguments - 'simple-error 'error)) - (sb!debug:*stack-top-hint* (maybe-find-stack-top-hint))) + 'simple-error 'error)) + (sb!debug:*stack-top-hint* (or sb!debug:*stack-top-hint* 'error))) (/show0 "done coercing DATUM to CONDITION") - (let ((sb!debug:*stack-top-hint* nil)) - (/show0 "signalling CONDITION from within ERROR") - (signal condition)) + (/show0 "signalling CONDITION from within ERROR") + (signal condition) (/show0 "done signalling CONDITION within ERROR") (invoke-debugger condition)))) (defun cerror (continue-string datum &rest arguments) (infinite-error-protect (with-simple-restart - (continue "~A" (apply #'format nil continue-string arguments)) + (continue "~A" (apply #'format nil continue-string arguments)) (let ((condition (coerce-to-condition datum - arguments - 'simple-error - 'cerror)) - (sb!debug:*stack-top-hint* (maybe-find-stack-top-hint))) - (with-condition-restarts condition (list (find-restart 'continue)) - (let ((sb!debug:*stack-top-hint* nil)) - (signal condition)) - (invoke-debugger condition))))) + arguments + 'simple-error + 'cerror))) + (with-condition-restarts condition (list (find-restart 'continue)) + (let ((sb!debug:*stack-top-hint* (or sb!debug:*stack-top-hint* 'cerror))) + (signal condition) + (invoke-debugger condition)))))) nil) ;;; like BREAK, but without rebinding *DEBUGGER-HOOK* to NIL, so that @@ -130,18 +136,19 @@ (defun %break (what &optional (datum "break") &rest arguments) (infinite-error-protect (with-simple-restart (continue "Return from ~S." what) - (let ((sb!debug:*stack-top-hint* (maybe-find-stack-top-hint))) - (invoke-debugger - (coerce-to-condition datum arguments 'simple-condition what))))) + (let ((sb!debug:*stack-top-hint* (or sb!debug:*stack-top-hint* '%break))) + (invoke-debugger + (coerce-to-condition datum arguments 'simple-condition what))))) nil) (defun break (&optional (datum "break") &rest arguments) #!+sb-doc "Print a message and invoke the debugger without allowing any possibility - of condition handling occurring." - (let ((*debugger-hook* nil)) ; as specifically required by ANSI +of condition handling occurring." + (let ((*debugger-hook* nil) ; as specifically required by ANSI + (sb!debug:*stack-top-hint* (or sb!debug:*stack-top-hint* 'break))) (apply #'%break 'break datum arguments))) - + (defun warn (datum &rest arguments) #!+sb-doc "Warn about a situation by signalling a condition formed by DATUM and @@ -155,29 +162,29 @@ ;; -- WHN 19991009 (if (not *cold-init-complete-p*) (progn - (/show0 "ignoring WARN in cold init, arguments=..") - #!+sb-show (dolist (argument arguments) - (sb!impl::cold-print argument))) + (/show0 "ignoring WARN in cold init, arguments=..") + #!+sb-show (dolist (argument arguments) + (sb!impl::cold-print argument))) (infinite-error-protect (/show0 "doing COERCE-TO-CONDITION") (let ((condition (coerce-to-condition datum arguments - 'simple-warning 'warn))) - (/show0 "back from COERCE-TO-CONDITION, doing ENFORCE-TYPE") - (enforce-type condition warning) - (/show0 "back from ENFORCE-TYPE, doing RESTART-CASE MUFFLE-WARNING") - (restart-case (signal condition) - (muffle-warning () - :report "Skip warning." - (return-from warn nil))) - (/show0 "back from RESTART-CASE MUFFLE-WARNING (i.e. normal return)") + 'simple-warning 'warn))) + (/show0 "back from COERCE-TO-CONDITION, doing ENFORCE-TYPE") + (enforce-type condition warning) + (/show0 "back from ENFORCE-TYPE, doing RESTART-CASE MUFFLE-WARNING") + (restart-case (signal condition) + (muffle-warning () + :report "Skip warning." + (return-from warn nil))) + (/show0 "back from RESTART-CASE MUFFLE-WARNING (i.e. normal return)") - (let ((badness (etypecase condition - (style-warning 'style-warning) - (warning 'warning)))) - (/show0 "got BADNESS, calling FORMAT") - (format *error-output* - "~&~@<~S: ~3i~:_~A~:>~%" - badness - condition) - (/show0 "back from FORMAT, voila!"))))) + (let ((badness (etypecase condition + (style-warning 'style-warning) + (warning 'warning)))) + (/show0 "got BADNESS, calling FORMAT") + (format *error-output* + "~&~@<~S: ~3i~:_~A~:>~%" + badness + condition) + (/show0 "back from FORMAT, voila!"))))) nil)