Skip to content
Snippets Groups Projects
Commit 49b7ec87 authored by wlott's avatar wlott
Browse files

Fixed MACROEXPAND-1 to pass the environment into MACRO-FUNCTION when

checking to see if the form has a macro defintion.  Otherwise,
macroexpanding macrolets doesn't work.
parent a00f4cdb
No related branches found
No related tags found
No related merge requests found
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
;;; Scott Fahlman or slisp-group@cs.cmu.edu. ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
;;; ;;;
(ext:file-comment (ext:file-comment
"$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/eval.lisp,v 1.16 1992/04/04 01:09:25 wlott Exp $") "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/eval.lisp,v 1.17 1992/04/20 19:07:57 wlott Exp $")
;;; ;;;
;;; ********************************************************************** ;;; **********************************************************************
;;; ;;;
...@@ -321,7 +321,7 @@ ...@@ -321,7 +321,7 @@
fact, a macro. Env is the lexical environment to expand in, which defaults fact, a macro. Env is the lexical environment to expand in, which defaults
to the null environment." to the null environment."
(cond ((and (consp form) (symbolp (car form))) (cond ((and (consp form) (symbolp (car form)))
(let ((def (macro-function (car form)))) (let ((def (macro-function (car form) env)))
(if def (if def
(values (invoke-macroexpand-hook def form env) t) (values (invoke-macroexpand-hook def form env) t)
(values form nil)))) (values form nil))))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment