X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fdefmacro.lisp;h=adb9d35df179c82bbf6e2d51c81b60b422f5329a;hb=bcbbce86c47a1c530d488c7876a453100fcd933e;hp=ea41418a5184e2e1ba297a93ba4c9c806bb3b614;hpb=3bd7a97d1b11a2b0aee086ef211cae807f3dfc35;p=sbcl.git diff --git a/src/code/defmacro.lisp b/src/code/defmacro.lisp index ea41418..adb9d35 100644 --- a/src/code/defmacro.lisp +++ b/src/code/defmacro.lisp @@ -35,22 +35,23 @@ ;;; still useful in the target interpreter, and in the ;;; cross-compilation host. (defun sb!c::%defmacro (name definition lambda-list doc) - (try-to-rename-interpreted-function-as-macro definition name lambda-list) + (declare (ignore lambda-list)) (sb!c::%%defmacro name definition doc)) ;;; (called by SB!C::%DEFMACRO) (eval-when (:compile-toplevel :load-toplevel :execute) (defun sb!c::%%defmacro (name definition doc) - ;; Old note (ca. 1985, maybe:-): "Eventually %%DEFMACRO should deal with - ;; clearing old compiler information for the functional value." + ;; old note (ca. 1985, maybe:-): "Eventually %%DEFMACRO should + ;; deal with clearing old compiler information for the functional + ;; value." (clear-info :function :where-from name) ;; FIXME: It would be nice to warn about DEFMACRO of an ;; already-defined macro, but that's slightly hard to do because ;; in common usage DEFMACRO is defined at compile time and then ;; redefined at load time. We'd need to make a distinction between ;; the defined-at-compile-time state and the defined-at-load-time - ;; state to make this work. (Trying to warn about duplicate DEFTYPEs - ;; runs into the same problem.) + ;; state to make this work. (Trying to warn about duplicate + ;; DEFTYPEs runs into the same problem.) #+nil (when (sb!xc:macro-function name) (style-warn "redefining ~S in DEFMACRO" name)) (setf (sb!xc:macro-function name) definition @@ -77,12 +78,15 @@ ;;; 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) + (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)