From de0a1e4064cf1b504aa86a1bc440604b36e7bec7 Mon Sep 17 00:00:00 2001 From: Douglas Katzman Date: Sat, 12 Mar 2016 10:17:12 -0500 Subject: [PATCH] Do half a fixme in fasteval, the trivial half. --- src/interpreter/env.lisp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/interpreter/env.lisp b/src/interpreter/env.lisp index 57ba276f0..09a266642 100644 --- a/src/interpreter/env.lisp +++ b/src/interpreter/env.lisp @@ -1092,7 +1092,11 @@ ;;; Also the parts for sb-cltl2 are fairly odious. (defun lexenv-from-env (env &optional reason) - (%lexenv-from-env (make-hash-table :test 'eq) env reason)) + (let ((lexenv (%lexenv-from-env (make-hash-table :test 'eq) env reason))) + (setf (sb-c::lexenv-%policy lexenv) (%policy (env-contour env)) + (sb-c::lexenv-disabled-package-locks lexenv) + (env-disabled-package-locks env)) + lexenv)) (defun %lexenv-from-env (var-map env &optional reason) (let ((lexenv (acond ((env-parent env) (%lexenv-from-env var-map it reason)) @@ -1222,8 +1226,7 @@ ;; (setf (sb-c::lexenv-vars lexenv) (nconc vars (sb-c::lexenv-vars lexenv)) (sb-c::lexenv-funs lexenv) (nconc funs (sb-c::lexenv-funs lexenv)) - (sb-c::lexenv-%policy lexenv) (%policy (env-contour env)) - ;; FIXME: package locks, handled conditions + ;; FIXME: handled conditions ))) lexenv)) -- 2.11.4.GIT