0.7.1.43

[sbcl.git] / src / compiler / ir1report.lisp

diff --git a/src/compiler/ir1report.lisp b/src/compiler/ir1report.lisp
index 5a77869..3a81b98 100644 (file)
--- a/src/compiler/ir1report.lisp
+++ b/src/compiler/ir1report.lisp
@@ -106,8 +106,8 @@
    list of subforms suitable for a \"~{~S ~}\" format string."
   (let ((n-whole (gensym)))
     `(setf (gethash ',name *source-context-methods*)
-          #'(lambda (,n-whole)
-              (destructuring-bind ,lambda-list ,n-whole ,@body)))))
+          (lambda (,n-whole)
+            (destructuring-bind ,lambda-list ,n-whole ,@body)))))
 
 (defmacro def-source-context (&rest rest)
   (deprecation-warning 'def-source-context 'define-source-context)
@@ -130,9 +130,9 @@
   (cond ((atom form) nil)
        ((>= (length form) 2)
         (funcall (gethash (first form) *source-context-methods*
-                          #'(lambda (x)
-                              (declare (ignore x))
-                              (list (first form) (second form))))
+                          (lambda (x)
+                            (declare (ignore x))
+                            (list (first form) (second form))))
                  (rest form)))
        (t
         form)))
@@ -208,6 +208,31 @@
          (*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
+;;; "&MORE processor for <something>" where <something> might be
+;;; either a source-name value (typically a symbol) or a non-symbol
+;;; debug-name value (typically a string). It's awkward to handle this
+;;; with FORMAT because we'd like to splice a source-name value using
+;;; "~S" (to get package qualifiers) but a debug-name value using "~A"
+;;; (to avoid irrelevant quotes at string splice boundaries).
+;;;
+;;; the problem, part II: The <something> is represented as a pair
+;;; of values, SOURCE-NAME and DEBUG-NAME, where SOURCE-NAME is used
+;;; 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 (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
 ;;; list of things that are going to be printed out in the error