From 49b7ec87e37c5485472bcf629a80fea82da29f0d Mon Sep 17 00:00:00 2001 From: wlott <wlott> Date: Mon, 20 Apr 1992 19:07:57 +0000 Subject: [PATCH] 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. --- code/eval.lisp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/eval.lisp b/code/eval.lisp index 5b2d93cb0..0e579199a 100644 --- a/code/eval.lisp +++ b/code/eval.lisp @@ -7,7 +7,7 @@ ;;; Scott Fahlman or slisp-group@cs.cmu.edu. ;;; (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 @@ fact, a macro. Env is the lexical environment to expand in, which defaults to the null environment." (cond ((and (consp form) (symbolp (car form))) - (let ((def (macro-function (car form)))) + (let ((def (macro-function (car form) env))) (if def (values (invoke-macroexpand-hook def form env) t) (values form nil)))) -- GitLab