From e89e37352f0992fb006057896e8eaa9bb15dc9d0 Mon Sep 17 00:00:00 2001 From: Christophe Rhodes Date: Wed, 2 May 2007 15:27:56 +0000 Subject: [PATCH] 1.0.5.19: restore building on cmucl 19a-ish ... sb!xc:macroexpand in code seen by the host compiler. (Said code was never executed by the host compiler, because of the return value of fopcompileable-p) --- src/compiler/fopcompile.lisp | 4 ++-- version.lisp-expr | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/compiler/fopcompile.lisp b/src/compiler/fopcompile.lisp index 3afa7afbc..3ddc35ca2 100644 --- a/src/compiler/fopcompile.lisp +++ b/src/compiler/fopcompile.lisp @@ -266,7 +266,7 @@ (fopcompile-constant form for-value-p)) ((symbolp form) (multiple-value-bind (macroexpansion macroexpanded-p) - (macroexpand form *lexenv*) + (sb!xc:macroexpand form *lexenv*) (if macroexpanded-p ;; Symbol macro (fopcompile macroexpansion path for-value-p) @@ -292,7 +292,7 @@ for-value-p)))))))))) ((listp form) (multiple-value-bind (macroexpansion macroexpanded-p) - (macroexpand form *lexenv*) + (sb!xc:macroexpand form *lexenv*) (if macroexpanded-p (fopcompile macroexpansion path for-value-p) (destructuring-bind (operator &rest args) form diff --git a/version.lisp-expr b/version.lisp-expr index 65c02b9dc..fb4b90515 100644 --- a/version.lisp-expr +++ b/version.lisp-expr @@ -17,4 +17,4 @@ ;;; checkins which aren't released. (And occasionally for internal ;;; versions, especially for internal versions off the main CVS ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".) -"1.0.5.18" +"1.0.5.19" -- 2.11.4.GIT