mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-06-16 16:50:21 +02:00
deprecate scm_sym2var
* libguile/deprecated.h: * libguile/deprecated.c (scm_sym2var): Deprecate this function. * libguile/modules.h: * libguile/modules.c (scm_module_ensure_local_variable): New public function, replacing scm_sym2var with a true definep, without going through eval closures (which are deprecated). (scm_current_module): Rework to do something sensible before modules are booted. (scm_module_lookup, scm_lookup): Refactor to use scm_module_variable. (scm_module_define, scm_define): Refactor to use scm_module_ensure_local_variable. * libguile/vm-i-system.c (define!): Use scm_define. * libguile/vm.c (resolve_variable): Use scm_module_lookup. * libguile/macros.c (scm_make_syntax_transformer): Use scm_module_variable. * libguile/gdbint.c (gdb_binding): Use scm_define. * doc/ref/api-modules.texi (Accessing Modules from C): Add docs for scm_module_ensure_local_variable.
This commit is contained in:
parent
15bb587f45
commit
62e15979b5
9 changed files with 132 additions and 97 deletions
|
@ -610,17 +610,10 @@ resolve_variable (SCM what, SCM program_module)
|
|||
{
|
||||
if (SCM_LIKELY (scm_is_symbol (what)))
|
||||
{
|
||||
if (SCM_LIKELY (scm_is_true (program_module)))
|
||||
/* might longjmp */
|
||||
if (scm_is_true (program_module))
|
||||
return scm_module_lookup (program_module, what);
|
||||
else
|
||||
{
|
||||
SCM v = scm_sym2var (what, SCM_BOOL_F, SCM_BOOL_F);
|
||||
if (scm_is_false (v))
|
||||
scm_misc_error (NULL, "unbound variable: ~S", scm_list_1 (what));
|
||||
else
|
||||
return v;
|
||||
}
|
||||
return scm_module_lookup (scm_the_root_module (), what);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue