From af9808d5d9f37ecb0793a6eda939ca3a940bc9c7 Mon Sep 17 00:00:00 2001
From: Juan Jose Garcia Ripoll <jjgarcia@users.sourceforge.net>
Date: Sun, 18 Mar 2012 20:03:30 +0100
Subject: [PATCH] Save the value of the code walker in the compiler environment

---
 src/c/compiler.d | 7 ++++---
 src/h/internal.h | 1 +
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/c/compiler.d b/src/c/compiler.d
index f184db56d..8c7d0bfef 100644
--- a/src/c/compiler.d
+++ b/src/c/compiler.d
@@ -567,7 +567,9 @@ c_new_env(cl_env_ptr the_env, cl_compiler_env_ptr new, cl_object env,
 		new->env_depth = old->env_depth + 1;
 		new->stepping = old->stepping;
                 new->mode = old->mode;
+		new->code_walker = old->code_walker;
 	} else {
+		new->code_walker = ECL_SYM_VAL(the_env, @'si::*code-walker*');
 		new->constants = si_make_vector(Ct, MAKE_FIXNUM(16),
 						Ct, /* Adjustable */
 						MAKE_FIXNUM(0), /* Fillp */
@@ -2256,14 +2258,13 @@ compile_symbol(cl_env_ptr env, cl_object stmt, int flags)
 static int
 compile_form(cl_env_ptr env, cl_object stmt, int flags) {
         const cl_compiler_ptr c_env = env->c_env;
-	cl_object code_walker = ECL_SYM_VAL(env, @'si::*code-walker*');
 	cl_object function;
 	int new_flags;
 
 	ecl_bds_bind(env, @'si::*current-form*', stmt);
  BEGIN:
-	if (code_walker != OBJNULL) {
-		stmt = funcall(3, ECL_SYM_VAL(env,@'si::*code-walker*'), stmt,
+	if (c_env->code_walker != OBJNULL) {
+		stmt = funcall(3, c_env->code_walker, stmt,
 			       CONS(c_env->variables, c_env->macros));
 	}
 	/*
diff --git a/src/h/internal.h b/src/h/internal.h
index e7782f1fd..bc7db1e87 100644
--- a/src/h/internal.h
+++ b/src/h/internal.h
@@ -107,6 +107,7 @@ struct cl_compiler_env {
 	cl_object constants;		/* Constants for this form */
         cl_object load_time_forms;	/* Constants that have to be rebuilt */
 	cl_object lex_env;		/* Lexical env. for eval-when */
+	cl_object code_walker;		/* Value of SI:*CODE-WALKER* */
 	cl_index env_depth;
 	cl_index env_size;
         int mode;