mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-20 19:50:24 +02:00
Code Activity

It's an "eval closure", not an "eval thunk." A thunk is a

Browse source 
function of no arguments.
* root.h (struct scm_root_state): Renamed
top_level_lookup_closure_var from top_level_lookup_thunk_var.
(scm_top_level_lookup_closure_var): Renamed from
scm_top_level_lookup_thunk_var.
* root.c (mark_root): Uses changed.
* gdbint.c (gdb_eval, gdb_binding): Uses changed.
* init.c (scm_start_stack): Uses changed.
* eval.c (scm_eval, scm_eval_x, scm_init_eval): Rename uses.
Change scheme-visible name to *top-level-lookup-closure* from
*top-level-lookup-thunk*.
This commit is contained in:
Jim Blandy 1996-11-21 16:28:39 +00:00
parent a31bc6fbba
commit dc19d1d29a
5 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
libguile/eval.c
View file

@ -2804,7 +2804,7 @@ scm_eval (obj)
SCM obj; SCM obj;
{ {
return 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); */ /* SCM_PROC(s_eval_x, "eval!", 1, 0, 0, scm_eval_x); */
@ -2816,7 +2816,7 @@ scm_eval_x (obj)
return return
scm_eval_3(obj, scm_eval_3(obj,
0, 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); 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); scm_make_synt (s_delay, scm_makacro, scm_m_delay);
/* end of acros */ /* end of acros */
scm_top_level_lookup_thunk_var = scm_top_level_lookup_closure_var =
scm_sysintern("*top-level-lookup-thunk*", SCM_BOOL_F); scm_sysintern("*top-level-lookup-closure*", SCM_BOOL_F);
scm_i_and = scm_make_synt ("and", scm_makmmacro, scm_m_and); scm_i_and = scm_make_synt ("and", scm_makmmacro, scm_m_and);
scm_i_begin = scm_make_synt ("begin", scm_makmmacro, scm_m_begin); scm_i_begin = scm_make_synt ("begin", scm_makmmacro, scm_m_begin);

4
libguile/gdbint.c
View file

@ -255,7 +255,7 @@ gdb_eval (exp)
} }
SCM_BEGIN_FOREIGN_BLOCK; 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)); gdb_result = scm_permanent_object (scm_ceval (exp, env));
} }
SCM_END_FOREIGN_BLOCK; SCM_END_FOREIGN_BLOCK;
@ -293,7 +293,7 @@ gdb_binding (name, value)
SCM_BEGIN_FOREIGN_BLOCK; SCM_BEGIN_FOREIGN_BLOCK;
{ {
SCM vcell = scm_sym2vcell (name, 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_BOOL_T);
SCM_SETCDR (vcell, value); SCM_SETCDR (vcell, value);
} }

2
libguile/init.c
View file

@ -134,7 +134,7 @@ scm_start_stack (base)
scm_exitval = SCM_BOOL_F; /* vestigial */ 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; scm_system_transformer = SCM_BOOL_F;
/* Create an object to hold the root continuation. /* Create an object to hold the root continuation.

2
libguile/root.c
View file

@ -83,7 +83,7 @@ mark_root (root)
scm_gc_mark (s->def_inp); scm_gc_mark (s->def_inp);
scm_gc_mark (s->def_outp); scm_gc_mark (s->def_outp);
scm_gc_mark (s->def_errp); 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); scm_gc_mark (s->system_transformer);
return SCM_ROOT_STATE (root) -> parent; return SCM_ROOT_STATE (root) -> parent;
} }

5
libguile/root.h
View file

@ -109,7 +109,7 @@ typedef struct scm_root_state
SCM def_errp; SCM def_errp;
SCM system_transformer; 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 handle; /* The root object for this root state */
SCM parent; /* The parent root object */ 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_inp (scm_root->def_inp)
#define scm_def_outp (scm_root->def_outp) #define scm_def_outp (scm_root->def_outp)
#define scm_def_errp (scm_root->def_errp) #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) #define scm_system_transformer (scm_root->system_transformer)
#ifdef USE_THREADS #ifdef USE_THREADS