0.pre7.11:

[sbcl.git] / src / code / defmacro.lisp

diff --git a/src/code/defmacro.lisp b/src/code/defmacro.lisp
index 8a0f43e..ea41418 100644 (file)
--- a/src/code/defmacro.lisp
+++ b/src/code/defmacro.lisp
@@ -11,9 +11,6 @@
 
 (in-package "SB!IMPL")
 
-(file-comment
-  "$Header$")
-
 ;;; the guts of the DEFMACRO macro, pulled out into a separate
 ;;; function in order to make it easier to express the common 
 ;;; bootstrap idiom
@@ -80,21 +77,18 @@
 ;;; 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.
-;;;
-;;; KLUDGE: Currently this is only used for various special
-;;; circumstances in bootstrapping, but it seems to me that it might
-;;; be a good basis for reimplementation of DEFMACRO in terms of
-;;; EVAL-WHEN, which might be easier to understand than the current
-;;; approach based on IR1 magic. -- WHN 19990811
 (def!macro defmacro-mundanely (name lambda-list &body body)
-  `(setf (sb!xc:macro-function ',name)
-        ,(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)
-             (declare (ignore doc))
-             `(lambda (,whole ,environment)
-                ,@local-decs
-                (block ,name
-                  ,new-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))))