From 4327269ded8c8ab49b6cc8e774b54b53c40ba550 Mon Sep 17 00:00:00 2001 From: wlott <wlott> Date: Thu, 6 Sep 1990 13:59:20 +0000 Subject: [PATCH] Use *lexical-environment*, not *fenv*. --- compiler/main.lisp | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/compiler/main.lisp b/compiler/main.lisp index fb04e72da..cdd910862 100644 --- a/compiler/main.lisp +++ b/compiler/main.lisp @@ -747,14 +747,15 @@ (defun preprocessor-macroexpand (form) (handler-case #+new-compiler (macroexpand-1 form *lexical-environment*) #-new-compiler - (if (consp form) - (let* ((name (car form)) - (exp (or (cddr (assoc name *fenv*)) - (info function macro-function name)))) - (if exp - (funcall exp form *fenv*) - form)) - form) + (let ((fenv (lexenv-functions *lexical-environment*))) + (if (consp form) + (let* ((name (car form)) + (exp (or (cddr (assoc name fenv)) + (info function macro-function name)))) + (if exp + (funcall exp form fenv) + form)) + form)) (error (condition) (compiler-error "(during macroexpansion)~%~A" condition)))) -- GitLab