mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-04-30 03:40:34 +02:00
thread the module through syntax-case's expansion
* libguile/debug.h: * libguile/debug.c (scm_procedure_module): New procedure, returns the module that was current when the given procedure was defined. Used by syncase to scope free identifiers. * module/ice-9/psyntax-pp.scm: Recompiled. * module/ice-9/psyntax.scm: Thread the module through the syntax expansion. This is harder than it would appear because in many places the different components of syntax objects are destructured. * module/ice-9/syncase.scm (guile-macro): Adapt to new signature for syntax transformer functions.
This commit is contained in:
parent
e02e84deed
commit
4e237f1460
5 changed files with 279 additions and 209 deletions
|
@ -400,6 +400,37 @@ SCM_DEFINE (scm_procedure_environment, "procedure-environment", 1, 0, 0,
|
|||
}
|
||||
#undef FUNC_NAME
|
||||
|
||||
SCM_DEFINE (scm_procedure_module, "procedure-module", 1, 0, 0,
|
||||
(SCM proc),
|
||||
"Return the module that was current when this procedure was defined.\n"
|
||||
"Free variables in this procedure are resolved relative to the\n"
|
||||
"procedure's module.")
|
||||
#define FUNC_NAME s_scm_procedure_module
|
||||
{
|
||||
SCM_VALIDATE_PROC (SCM_ARG1, proc);
|
||||
|
||||
if (scm_is_true (scm_program_p (proc)))
|
||||
return scm_program_module (proc);
|
||||
else
|
||||
{
|
||||
SCM env = scm_procedure_environment (proc);
|
||||
|
||||
if (scm_is_null (env))
|
||||
return SCM_BOOL_F;
|
||||
else
|
||||
{
|
||||
for (; !scm_is_null (scm_cdr (env)); env = scm_cdr (env))
|
||||
;
|
||||
if (SCM_EVAL_CLOSURE_P (scm_car (env)))
|
||||
return SCM_PACK (SCM_SMOB_DATA (scm_car (env)));
|
||||
else
|
||||
return SCM_BOOL_F;
|
||||
}
|
||||
}
|
||||
}
|
||||
#undef FUNC_NAME
|
||||
|
||||
|
||||
|
||||
|
||||
/* Eval in a local environment. We would like to have the ability to
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue