X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fdefmacro.lisp;h=ac2702f9868b7b22f09f2bf96faeb48a8ac12ab5;hb=f578dd10fa6d9a8d7c3d15d3100406976f6a273c;hp=276c6d4c0250db31ce4f53a073075e256f73f322;hpb=512f941895f93afd4cf2ffedfd02124faedaa8ff;p=sbcl.git

diff --git a/src/code/defmacro.lisp b/src/code/defmacro.lisp
index 276c6d4..ac2702f 100644
--- a/src/code/defmacro.lisp
+++ b/src/code/defmacro.lisp
@@ -30,18 +30,24 @@
 			  :environment environment)
 	(let ((def `(lambda (,whole ,environment)
 		      ,@local-decs
-		      (block ,name
-			,new-body))))
+		      (block ,name 
+			,new-body)))
+	      ;; if we want to move over to list-style names
+	      ;; [e.g. (DEFMACRO FOO), maybe to support some XREF-like
+	      ;; functionality] here might be a good place to start.
+	      (debug-name (debug-namify "DEFMACRO ~S" name)))
 	  `(eval-when (:compile-toplevel :load-toplevel :execute)
-             (sb!c::%defmacro ',name #',def ',lambda-list ,doc)))))))
+             (sb!c::%defmacro ',name #',def ',lambda-list ,doc ,debug-name)))))))
 
 (macrolet
-    ((def (times set-args-p)
+    ((def (times set-p)
        `(eval-when (,@times)
-          (defun sb!c::%defmacro (name definition lambda-list doc)
+          (defun sb!c::%defmacro (name definition lambda-list doc debug-name)
             ;; old note (ca. 1985, maybe:-): "Eventually %%DEFMACRO
             ;; should deal with clearing old compiler information for
             ;; the functional value."
+            ,@(unless set-p
+                '((declare (ignore lambda-list debug-name))))
             (ecase (info :function :kind name)
               ((nil))
               (:function
@@ -73,14 +79,17 @@
                     (style-warn "redefining ~S in DEFMACRO" name))
             (setf (sb!xc:macro-function name) definition
                   (fdocumentation name 'function) doc)
-            ,(when set-args-p
+            ,(when set-p
                    `(case (widetag-of definition)
                       (#.sb!vm:closure-header-widetag
                        (setf (%simple-fun-arglist (%closure-fun definition))
-                             lambda-list))
+                             lambda-list
+			     (%simple-fun-name (%closure-fun definition))
+			     debug-name))
                       ((#.sb!vm:simple-fun-header-widetag
                         #.sb!vm:closure-fun-header-widetag)
-                       (setf (%simple-fun-arglist definition) lambda-list))))
+                       (setf (%simple-fun-arglist definition) lambda-list
+			     (%simple-fun-name definition) debug-name))))
             name))))
   (progn
     (def (:load-toplevel :execute) #-sb-xc-host t #+sb-xc-host nil)
@@ -106,21 +115,23 @@
 ;;; DEFMACRO-MUNDANELY is like SB!XC:DEFMACRO, except that it doesn't
 ;;; have any EVAL-WHEN or IR1 magic associated with it, so it only
 ;;; takes effect in :LOAD-TOPLEVEL or :EXECUTE situations.
-;;;
-;;; FIXME: It'd probably be good (especially for DEFMACRO)
-;;; to make this share more code with DEFMACRO.
 (def!macro defmacro-mundanely (name lambda-list &body body)
-  (let ((whole (gensym "WHOLE-"))
-	(environment (gensym "ENVIRONMENT-")))
-    (multiple-value-bind (new-body local-decs doc)
-	(parse-defmacro lambda-list whole body name 'defmacro
-			:environment environment)
-      `(progn
-	 (setf (sb!xc:macro-function ',name)
-	       (lambda (,whole ,environment)
-		   ,@local-decs
-		   (block ,name
-		   ,new-body)))
-	 (setf (fdocumentation ',name 'macro)
-	       ,doc)
-	 ',name))))
+
+  ;; old way:
+  ;;(let ((whole (gensym "WHOLE-"))
+  ;;      (environment (gensym "ENVIRONMENT-")))
+  ;;  (multiple-value-bind (new-body local-decs doc)
+  ;;      (parse-defmacro lambda-list whole body name 'defmacro
+  ;;                      :environment environment)
+  ;;    `(progn
+  ;;       (setf (sb!xc:macro-function ',name)
+  ;;             (lambda (,whole ,environment)
+  ;;                 ,@local-decs
+  ;;                 (block ,name
+  ;;                 ,new-body)))
+  ;;       (setf (fdocumentation ',name 'macro)
+  ;;             ,doc)
+  ;;       ',name)))
+
+  `(let ()
+     (sb!xc:defmacro ,name ,lambda-list ,@body)))