X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fir1report.lisp;h=f598a0489007bc9d2203302313a14cdc3e509926;hb=68612b8227bdd1a9e70962201f54231c82affa17;hp=697e7c4f2b45119f09845c8beee98d1f86df00c0;hpb=09957fcf57b49ed5ae5f05d62ad12d7ddbfd8e1d;p=sbcl.git diff --git a/src/compiler/ir1report.lisp b/src/compiler/ir1report.lisp index 697e7c4..f598a04 100644 --- a/src/compiler/ir1report.lisp +++ b/src/compiler/ir1report.lisp @@ -129,11 +129,14 @@ (defun source-form-context (form) (cond ((atom form) nil) ((>= (length form) 2) - (funcall (gethash (first form) *source-context-methods* - (lambda (x) - (declare (ignore x)) - (list (first form) (second form)))) - (rest form))) + (let* ((context-fun-default (lambda (x) + (declare (ignore x)) + (list (first form) (second form)))) + (context-fun (gethash (first form) + *source-context-methods* + context-fun-default))) + (declare (type function context-fun)) + (funcall context-fun (rest form)))) (t form))) @@ -192,22 +195,6 @@ (format nil "~<~@; ~S~:>" (list form)) (prin1-to-string form))))) -;;; shorthand for creating debug names from source names or other -;;; stems, e.g. -;;; (DEBUG-NAMIFY "FLET ~S" SOURCE-NAME) -;;; (DEBUG-NAMIFY "top level form ~S" FORM) -;;; -;;; FIXME: This function seems to have a lot in common with -;;; STRINGIFY-FORM, and perhaps there's some way to merge the two -;;; functions. -(defun debug-namify (format-string &rest format-arguments) - (with-standard-io-syntax - (let ((*print-readably* nil) - (*package* *cl-package*) - (*print-length* 3) - (*print-level* 2)) - (apply #'format nil format-string format-arguments)))) - ;;; shorthand for a repeated idiom in creating debug names ;;; ;;; the problem, part I: We want to create debug names that look like @@ -220,14 +207,18 @@ ;;; ;;; the problem, part II: The is represented as a pair ;;; of values, SOURCE-NAME and DEBUG-NAME, where SOURCE-NAME is used -;;; if it's not null. +;;; if it's not .ANONYMOUS. (This is parallel to the way that ordinarily +;;; we don't use a value if it's NIL, instead defaulting it. But we +;;; can't safely/comfortably use NIL for that in this context, since +;;; the app programmer can use NIL as a name, so we use the private +;;; symbol .ANONYMOUS. instead.) ;;; ;;; the solution: Use this function to convert whatever it is to a ;;; string, which FORMAT can then splice using "~A". (defun as-debug-name (source-name debug-name) - (if source-name - (debug-namify "~S" source-name) - debug-name)) + (if (eql source-name '.anonymous.) + debug-name + (debug-namify "~S" source-name))) ;;; Return a COMPILER-ERROR-CONTEXT structure describing the current ;;; error context, or NIL if we can't figure anything out. ARGS is a @@ -409,7 +400,7 @@ (what (etypecase condition (style-warning 'style-warning) (warning 'warning) - (error 'error)))) + ((or error compiler-error) 'error)))) (multiple-value-bind (format-string format-args) (if (typep condition 'simple-condition) (values (simple-condition-format-control condition) @@ -424,33 +415,52 @@ format-args))) (values)) -;;; COMPILER-NOTE is vaguely like COMPILER-ERROR and the other -;;; condition-signalling functions, but it just writes some output -;;; instead of signalling. (In CMU CL, it did signal a condition, but -;;; this didn't seem to work all that well; it was weird to have -;;; COMPILE-FILE return with WARNINGS-P set when the only problem was -;;; that the compiler couldn't figure out how to compile something as -;;; efficiently as it liked.) -(defun compiler-note (format-string &rest format-args) +;;; The act of signalling one of these beasts must not cause WARNINGSP +;;; (or FAILUREP) to be set from COMPILE or COMPILE-FILE, so we can't +;;; inherit from WARNING or STYLE-WARNING. +;;; +;;; FIXME: the handling of compiler-notes could be unified with +;;; warnings and style-warnings (see the various handler functions +;;; below). +(define-condition compiler-note (condition) ()) +(define-condition simple-compiler-note (simple-condition compiler-note) ()) + +(defun compiler-notify (format-string &rest format-args) + ;; FORMAT-STRING and FORMAT-ARGS might well end up turning into + ;; DATUM and REST, and COERCE-TO-CONDITION will be used. (unless (if *compiler-error-context* (policy *compiler-error-context* (= inhibit-warnings 3)) (policy *lexenv* (= inhibit-warnings 3))) + (restart-case + (signal (make-condition 'simple-compiler-note + :format-control format-string + :format-arguments format-args)) + (muffle-warning () + (return-from compiler-notify (values)))) (incf *compiler-note-count*) (print-compiler-message (format nil "note: ~A" format-string) format-args)) (values)) ;;; Issue a note when we might or might not be in the compiler. -(defun maybe-compiler-note (&rest rest) +(defun maybe-compiler-notify (&rest rest) (if (boundp '*lexenv*) ; if we're in the compiler - (apply #'compiler-note rest) - (let ((stream *error-output*)) - (pprint-logical-block (stream nil :per-line-prefix ";") - - (format stream " note: ~3I~_") - (pprint-logical-block (stream nil) - (apply #'format stream rest))) - (fresh-line stream)))) ; (outside logical block, no per-line-prefix) + (apply #'compiler-notify rest) + (progn + (restart-case + (signal (make-condition 'simple-compiler-note + :format-control (car rest) + :format-arguments (cdr rest))) + (muffle-warning () + (return-from maybe-compiler-notify (values)))) + (let ((stream *error-output*)) + (pprint-logical-block (stream nil :per-line-prefix ";") + (format stream " note: ~3I~_") + (pprint-logical-block (stream nil) + (apply #'format stream rest))) + ;; (outside logical block, no per-line-prefix) + (fresh-line stream)) + (values)))) ;;; The politically correct way to print out progress messages and ;;; such like. We clear the current error context so that we know that