diff options
author | Mikael Djurfeldt <djurfeldt@nada.kth.se> | 2000-06-21 02:46:01 +0000 |
---|---|---|
committer | Mikael Djurfeldt <djurfeldt@nada.kth.se> | 2000-06-21 02:46:01 +0000 |
commit | 7e73eaee6ef8b4471b90917e8a98ffcb739644b2 (patch) | |
tree | 88f6b25935c670f634a8766b8473076689b9f92a | |
parent | 51eb747ebfcac593fced29d073c6b49f57e896aa (diff) | |
download | guile-7e73eaee6ef8b4471b90917e8a98ffcb739644b2.tar.gz |
(SCM_TOP_LEVEL_LOOKUP_CLOSURE): New macro which replaces
SCM_CDR (scm_top_level_lookup_closure_var) everywhere.
-rw-r--r-- | libguile/debug.c | 4 | ||||
-rw-r--r-- | libguile/evalext.c | 4 | ||||
-rw-r--r-- | libguile/fluids.c | 2 | ||||
-rw-r--r-- | libguile/gdbint.c | 6 | ||||
-rw-r--r-- | libguile/symbols.c | 6 |
5 files changed, 11 insertions, 11 deletions
diff --git a/libguile/debug.c b/libguile/debug.c index 74129a17f..81b3576e4 100644 --- a/libguile/debug.c +++ b/libguile/debug.c @@ -263,7 +263,7 @@ SCM_DEFINE (scm_make_gloc, "make-gloc", 1, 1, 0, #endif SCM_VALIDATE_VARIABLE (1,var); if (SCM_UNBNDP (env)) - env = scm_top_level_env (SCM_CDR (scm_top_level_lookup_closure_var)); + env = scm_top_level_env (SCM_TOP_LEVEL_LOOKUP_CLOSURE); else SCM_VALIDATE_NULLORCONS (2,env); return scm_make_memoized (SCM_VARVCELL (var) + 1, env); @@ -328,7 +328,7 @@ SCM_DEFINE (scm_memcons, "memcons", 2, 1, 0, cdr = SCM_MEMOIZED_EXP (cdr); } if (SCM_UNBNDP (env)) - env = scm_top_level_env (SCM_CDR (scm_top_level_lookup_closure_var)); + env = scm_top_level_env (SCM_TOP_LEVEL_LOOKUP_CLOSURE); else SCM_VALIDATE_NULLORCONS (3,env); return scm_make_memoized (scm_cons (car, cdr), env); diff --git a/libguile/evalext.c b/libguile/evalext.c index f4b9eac89..843897c57 100644 --- a/libguile/evalext.c +++ b/libguile/evalext.c @@ -48,7 +48,7 @@ #include "libguile/eval.h" #include "libguile/macros.h" #include "libguile/modules.h" -#include "libguile/root.h" +#include "libguile/fluids.h" #include "libguile/validate.h" #include "libguile/evalext.h" @@ -79,7 +79,7 @@ SCM_DEFINE (scm_definedp, "defined?", 1, 1, 0, if (SCM_UNBNDP (env)) vcell = scm_sym2vcell(sym, - SCM_CDR (scm_top_level_lookup_closure_var), + SCM_TOP_LEVEL_LOOKUP_CLOSURE, SCM_BOOL_F); else { diff --git a/libguile/fluids.c b/libguile/fluids.c index 88897ab73..e7841d884 100644 --- a/libguile/fluids.c +++ b/libguile/fluids.c @@ -160,7 +160,7 @@ SCM_DEFINE (scm_fluid_ref, "fluid-ref", 1, 0, 0, if (SCM_LENGTH (scm_root->fluids) <= n) grow_fluids (scm_root, n+1); - return SCM_VELTS(scm_root->fluids)[n]; + return SCM_VELTS (scm_root->fluids)[n]; } #undef FUNC_NAME diff --git a/libguile/gdbint.c b/libguile/gdbint.c index 59ad14093..bc0c73ac5 100644 --- a/libguile/gdbint.c +++ b/libguile/gdbint.c @@ -61,7 +61,7 @@ #include "libguile/chars.h" #include "libguile/modules.h" #include "libguile/ports.h" -#include "libguile/root.h" +#include "libguile/fluids.h" #include "libguile/strings.h" #include "libguile/init.h" @@ -256,7 +256,7 @@ gdb_eval (SCM exp) } SCM_BEGIN_FOREIGN_BLOCK; { - SCM env = scm_top_level_env (SCM_CDR (scm_top_level_lookup_closure_var)); + SCM env = scm_top_level_env (SCM_TOP_LEVEL_LOOKUP_CLOSURE); gdb_result = scm_permanent_object (scm_ceval (exp, env)); } SCM_END_FOREIGN_BLOCK; @@ -302,7 +302,7 @@ gdb_binding (SCM name, SCM value) SCM_BEGIN_FOREIGN_BLOCK; { SCM vcell = scm_sym2vcell (name, - SCM_CDR (scm_top_level_lookup_closure_var), + SCM_TOP_LEVEL_LOOKUP_CLOSURE, SCM_BOOL_T); SCM_SETCDR (vcell, value); } diff --git a/libguile/symbols.c b/libguile/symbols.c index dffa8cb25..1c56a6e10 100644 --- a/libguile/symbols.c +++ b/libguile/symbols.c @@ -50,7 +50,7 @@ #include "libguile/eval.h" #include "libguile/variable.h" #include "libguile/alist.h" -#include "libguile/root.h" +#include "libguile/fluids.h" #include "libguile/strings.h" #include "libguile/vectors.h" #include "libguile/weaks.h" @@ -398,7 +398,7 @@ scm_sysintern0 (const char *name) { SCM lookup_proc; if (scm_can_use_top_level_lookup_closure_var && - SCM_NIMP (lookup_proc = SCM_CDR (scm_top_level_lookup_closure_var))) + SCM_NIMP (lookup_proc = SCM_TOP_LEVEL_LOOKUP_CLOSURE)) { SCM sym = SCM_CAR (scm_intern0 (name)); SCM vcell = scm_sym2vcell (sym, lookup_proc, SCM_BOOL_T); @@ -420,7 +420,7 @@ scm_symbol_value0 (const char *name) lookup closures are written in scheme which needs real symbols. */ SCM symbol = scm_intern_obarray_soft (name, strlen (name), scm_symhash, 0); SCM vcell = scm_sym2vcell (SCM_CAR (symbol), - SCM_CDR (scm_top_level_lookup_closure_var), + SCM_TOP_LEVEL_LOOKUP_CLOSURE, SCM_BOOL_F); if (SCM_FALSEP (vcell)) return SCM_UNDEFINED; |