diff options
Diffstat (limited to 'libguile')
-rw-r--r-- | libguile/eval.c | 8 | ||||
-rw-r--r-- | libguile/gdbint.c | 4 | ||||
-rw-r--r-- | libguile/init.c | 2 | ||||
-rw-r--r-- | libguile/root.c | 2 | ||||
-rw-r--r-- | libguile/root.h | 5 |
5 files changed, 11 insertions, 10 deletions
diff --git a/libguile/eval.c b/libguile/eval.c index 4224f6b3e..fe6b96b31 100644 --- a/libguile/eval.c +++ b/libguile/eval.c @@ -2804,7 +2804,7 @@ scm_eval (obj) SCM obj; { return - scm_eval_3(obj, 1, scm_top_level_env(SCM_CDR(scm_top_level_lookup_thunk_var))); + scm_eval_3(obj, 1, scm_top_level_env(SCM_CDR(scm_top_level_lookup_closure_var))); } /* SCM_PROC(s_eval_x, "eval!", 1, 0, 0, scm_eval_x); */ @@ -2816,7 +2816,7 @@ scm_eval_x (obj) return scm_eval_3(obj, 0, - scm_top_level_env (SCM_CDR (scm_top_level_lookup_thunk_var))); + scm_top_level_env (SCM_CDR (scm_top_level_lookup_closure_var))); } SCM_PROC (s_macro_eval_x, "macro-eval!", 2, 0, 0, scm_macro_eval_x); @@ -2902,8 +2902,8 @@ scm_init_eval () scm_make_synt (s_delay, scm_makacro, scm_m_delay); /* end of acros */ - scm_top_level_lookup_thunk_var = - scm_sysintern("*top-level-lookup-thunk*", SCM_BOOL_F); + scm_top_level_lookup_closure_var = + scm_sysintern("*top-level-lookup-closure*", SCM_BOOL_F); scm_i_and = scm_make_synt ("and", scm_makmmacro, scm_m_and); scm_i_begin = scm_make_synt ("begin", scm_makmmacro, scm_m_begin); diff --git a/libguile/gdbint.c b/libguile/gdbint.c index 74e70fe13..3ce4f2eca 100644 --- a/libguile/gdbint.c +++ b/libguile/gdbint.c @@ -255,7 +255,7 @@ gdb_eval (exp) } SCM_BEGIN_FOREIGN_BLOCK; { - SCM env = scm_top_level_env (SCM_CDR (scm_top_level_lookup_thunk_var)); + SCM env = scm_top_level_env (SCM_CDR (scm_top_level_lookup_closure_var)); gdb_result = scm_permanent_object (scm_ceval (exp, env)); } SCM_END_FOREIGN_BLOCK; @@ -293,7 +293,7 @@ gdb_binding (name, value) SCM_BEGIN_FOREIGN_BLOCK; { SCM vcell = scm_sym2vcell (name, - SCM_CDR (scm_top_level_lookup_thunk_var), + SCM_CDR (scm_top_level_lookup_closure_var), SCM_BOOL_T); SCM_SETCDR (vcell, value); } diff --git a/libguile/init.c b/libguile/init.c index a2b8ce54b..d42e97cae 100644 --- a/libguile/init.c +++ b/libguile/init.c @@ -134,7 +134,7 @@ scm_start_stack (base) scm_exitval = SCM_BOOL_F; /* vestigial */ - scm_top_level_lookup_thunk_var = SCM_BOOL_F; + scm_top_level_lookup_closure_var = SCM_BOOL_F; scm_system_transformer = SCM_BOOL_F; /* Create an object to hold the root continuation. diff --git a/libguile/root.c b/libguile/root.c index 23c32654b..81310f684 100644 --- a/libguile/root.c +++ b/libguile/root.c @@ -83,7 +83,7 @@ mark_root (root) scm_gc_mark (s->def_inp); scm_gc_mark (s->def_outp); scm_gc_mark (s->def_errp); - scm_gc_mark (s->top_level_lookup_thunk_var); + scm_gc_mark (s->top_level_lookup_closure_var); scm_gc_mark (s->system_transformer); return SCM_ROOT_STATE (root) -> parent; } diff --git a/libguile/root.h b/libguile/root.h index b71305563..37857d47d 100644 --- a/libguile/root.h +++ b/libguile/root.h @@ -109,7 +109,7 @@ typedef struct scm_root_state SCM def_errp; SCM system_transformer; - SCM top_level_lookup_thunk_var; + SCM top_level_lookup_closure_var; SCM handle; /* The root object for this root state */ SCM parent; /* The parent root object */ @@ -134,7 +134,8 @@ typedef struct scm_root_state #define scm_def_inp (scm_root->def_inp) #define scm_def_outp (scm_root->def_outp) #define scm_def_errp (scm_root->def_errp) -#define scm_top_level_lookup_thunk_var (scm_root->top_level_lookup_thunk_var) +#define scm_top_level_lookup_closure_var \ + (scm_root->top_level_lookup_closure_var) #define scm_system_transformer (scm_root->system_transformer) #ifdef USE_THREADS |