mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-05-01 12:20:26 +02:00
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.
This commit is contained in:
parent
1963682290
commit
f39fc3b38c
4 changed files with 6 additions and 62 deletions
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue