X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fir1report.lisp;h=3a81b986a2451c976db676a25ebe63746761c87f;hb=5edd74f6911093805a009a152b32216b3dba59f7;hp=c12736afc1068e26078fb32ac58d05e39fdfd0df;hpb=b05f52060838600d14b5d8ad4604a61351dd7017;p=sbcl.git

diff --git a/src/compiler/ir1report.lisp b/src/compiler/ir1report.lisp
index c12736a..3a81b98 100644
--- 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)))
@@ -220,14 +220,18 @@
 ;;;
 ;;; 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 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