diff options
author | Andy Wingo <wingo@pobox.com> | 2012-05-23 12:00:23 +0200 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2012-05-23 12:00:23 +0200 |
commit | 3f48638c8c82d7839b75204e475af691fcd67c33 (patch) | |
tree | b6620a485207fe45f1266227ad6d0d8b3ab7146b /libguile/modules.c | |
parent | 62e15979b5d773dda79c4f44c07e919b5d0f6e18 (diff) | |
download | guile-3f48638c8c82d7839b75204e475af691fcd67c33.tar.gz |
deprecate lookup closures
* libguile/deprecated.h (SCM_TOP_LEVEL_LOOKUP_CLOSURE):
* libguile/deprecated.c (scm_lookup_closure_module):
(scm_module_lookup_closure):
(scm_current_module_lookup_closure): Deprecate this part of the eval
closure interface. It was unused internally, after the scm_sym2var
refactor.
* libguile/eval.h:
* libguile/modules.c:
* libguile/modules.h: Remove deprecated code.
* libguile/goops.c (scm_ensure_accessor): Use scm_module_variable
instead of calling the lookup closure. However I'm not sure that this
code is used at all.
Diffstat (limited to 'libguile/modules.c')
-rw-r--r-- | libguile/modules.c | 50 |
1 files changed, 0 insertions, 50 deletions
diff --git a/libguile/modules.c b/libguile/modules.c index 9ccbad38b..a7c0c0ce9 100644 --- a/libguile/modules.c +++ b/libguile/modules.c @@ -236,38 +236,6 @@ scm_c_export (const char *name, ...) } -/* Environments */ - -SCM_SYMBOL (sym_module, "module"); - -SCM -scm_lookup_closure_module (SCM proc) -{ - if (scm_is_false (proc)) - return scm_the_root_module (); - else if (SCM_EVAL_CLOSURE_P (proc)) - return SCM_PACK (SCM_SMOB_DATA (proc)); - else - { - SCM mod; - - /* FIXME: The `module' property is no longer set on eval closures, as it - introduced a circular reference that precludes garbage collection of - modules with the current weak hash table semantics (see - http://lists.gnu.org/archive/html/guile-devel/2009-01/msg00102.html and - http://thread.gmane.org/gmane.comp.programming.garbage-collection.boehmgc/2465 - for details). Since it doesn't appear to be used (only in this - function, which has 1 caller), we no longer extend - `set-module-eval-closure!' to set the `module' property. */ - abort (); - - mod = scm_procedure_property (proc, sym_module); - if (scm_is_false (mod)) - mod = scm_the_root_module (); - return mod; - } -} - /* * C level implementation of the standard eval closure * @@ -611,24 +579,6 @@ SCM_DEFINE (scm_eval_closure_module, } #undef FUNC_NAME -SCM -scm_module_lookup_closure (SCM module) -{ - if (scm_is_false (module)) - return SCM_BOOL_F; - else - return SCM_MODULE_EVAL_CLOSURE (module); -} - -SCM -scm_current_module_lookup_closure () -{ - if (scm_module_system_booted_p) - return scm_module_lookup_closure (scm_current_module ()); - else - return SCM_BOOL_F; -} - SCM_SYMBOL (sym_macroexpand, "macroexpand"); SCM_DEFINE (scm_module_transformer, "module-transformer", 1, 0, 0, |