summaryrefslogtreecommitdiff
path: root/libguile/modules.c
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2009-11-27 17:24:12 +0100
committerAndy Wingo <wingo@pobox.com>2009-12-01 21:00:25 +0100
commitf39fc3b38cbd7dda61def29bd8ef2d8f7ca27dd5 (patch)
treebaf1e9d5e64996bd3d5ee7d6ab13a319e38747e9 /libguile/modules.c
parent1963682290baa7d49f56a0e6aaf8a4880265f868 (diff)
downloadguile-f39fc3b38cbd7dda61def29bd8ef2d8f7ca27dd5.tar.gz
remove some deprecated things, undeprecate scm_the_root_module()
* libguile/deprecated.h * libguile/deprecated.c (SCM_ILOC00, SCM_IDINC, SCM_IDSTMSK) (scm_s_expression, scm_s_test, scm_s_body, scm_s_bindings) (scm_s_variable, scm_s_clauses, scm_s_formals, SCM_EVALIM2) (SCM_EVALIM, SCM_XEVAL, SCM_XEVALCAR): Remove these macros and constants, deprecated in 2003. (scm_the_root_module): Undeprecate, it's actually a useful function, that other parts of the code use. * libguile/modules.h (scm_the_root_module): Undeprecated. * libguile/modules.c (scm_the_root_module): Rename from the_root_module. Use it in the rest of this file.
Diffstat (limited to 'libguile/modules.c')
-rw-r--r--libguile/modules.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/libguile/modules.c b/libguile/modules.c
index c7f0a46b0..db2ce73f8 100644
--- a/libguile/modules.c
+++ b/libguile/modules.c
@@ -52,8 +52,8 @@ static SCM unbound_variable (const char *func, SCM sym)
"Unbound variable: ~S", scm_list_1 (sym), SCM_BOOL_F);
}
-static SCM
-the_root_module ()
+SCM
+scm_the_root_module (void)
{
if (scm_module_system_booted_p)
return SCM_VARIABLE_REF (the_root_module_var);
@@ -68,7 +68,7 @@ SCM_DEFINE (scm_current_module, "current-module", 0, 0, 0,
{
SCM curr = scm_fluid_ref (the_module);
- return scm_is_true (curr) ? curr : the_root_module ();
+ return scm_is_true (curr) ? curr : scm_the_root_module ();
}
#undef FUNC_NAME
@@ -257,7 +257,7 @@ SCM
scm_lookup_closure_module (SCM proc)
{
if (scm_is_false (proc))
- return the_root_module ();
+ return scm_the_root_module ();
else if (SCM_EVAL_CLOSURE_P (proc))
return SCM_PACK (SCM_SMOB_DATA (proc));
else
@@ -270,7 +270,7 @@ scm_lookup_closure_module (SCM proc)
mod = scm_procedure_property (proc, sym_module);
if (scm_is_false (mod))
- mod = the_root_module ();
+ mod = scm_the_root_module ();
return mod;
}
}