-/*
-ly-module.cc -- implement guile module stuff.
-
-source file of the GNU LilyPond music typesetter
+/*
+ ly-module.cc -- implement guile module stuff.
-(c) 2002--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ source file of the GNU LilyPond music typesetter
- */
+ (c) 2002--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
-#include "string.hh"
#include "lily-guile.hh"
-#include "ly-modules.hh"
+#include "warn.hh"
+#include "main.hh"
+#include "std-string.hh"
#include "protected-scm.hh"
-#define FUNC_NAME __FUNCTION__
-
-static int module_count;
+#ifdef MODULE_GC_KLUDGE
+Protected_scm anonymous_modules = SCM_EOL;
+bool perform_gc_kludge;
+#endif
void
-ly_init_anonymous_module (void * data)
+clear_anonymous_modules ()
{
- scm_c_use_module ("lily");
-}
-
-Protected_scm anon_modules;
+#ifdef MODULE_GC_KLUDGE
+ for (SCM s = anonymous_modules;
+ scm_is_pair (s);
+ s = scm_cdr (s))
+ {
+ SCM module = scm_car (s);
+ SCM closure = SCM_MODULE_EVAL_CLOSURE (module);
+ SCM prop = scm_procedure_property (closure, ly_symbol2scm ("module"));
+
+ if (ly_is_module (prop))
+ {
+ scm_set_procedure_property_x (closure, ly_symbol2scm ("module"),
+ SCM_BOOL_F);
+ }
+ }
-SCM
-ly_make_anonymous_module ()
-{
- String s = "*anonymous-ly-" + to_string (module_count++) + "*";
- SCM mod = scm_c_define_module (s.to_str0(), ly_init_anonymous_module, 0);
- anon_modules = scm_cons (mod, anon_modules);
- return mod;
+ anonymous_modules = SCM_EOL;
+#endif
}
-void
-ly_clear_anonymous_modules ()
+SCM
+ly_make_anonymous_module (bool safe)
{
- SCM s = anon_modules;
- anon_modules = SCM_EOL;
-
- for (; gh_pair_p (s) ; s = gh_cdr (s))
+ SCM mod = SCM_EOL;
+ if (!safe)
{
- SCM tab= scm_c_make_hash_table (2);
- /*
- UGH.
- */
-
- SCM_STRUCT_DATA(gh_car(s))[scm_module_index_obarray] = (long unsigned int) tab;
- }
-}
+ SCM maker = ly_lily_module_constant ("make-module");
-#define FUNC_NAME __FUNCTION__
+ SCM scm_module = ly_lily_module_constant ("the-scm-module");
-SCM
-define_one_var (void * closure, SCM key, SCM val, SCM result)
-{
- SCM dest = (SCM) closure;
- scm_module_define (dest, key, scm_variable_ref (val));
- return SCM_EOL;
-}
+ mod = scm_call_0 (maker);
+ scm_module_define (mod, ly_symbol2scm ("%module-public-interface"),
+ mod);
-/*
- Ugh signature of scm_internal_hash_fold () is inaccurate.
- */
-typedef SCM (*Hash_cl_func)();
+ ly_use_module (mod, scm_module);
+ ly_use_module (mod, global_lily_module);
+ }
+ else
+ {
+ SCM proc = ly_lily_module_constant ("make-safe-lilypond-module");
+ mod = scm_call_0 (proc);
+ }
-void
-ly_copy_module_variables (SCM dest, SCM src)
-{
- SCM_VALIDATE_MODULE (1, src);
+#ifdef MODULE_GC_KLUDGE
+ if (perform_gc_kludge)
+ anonymous_modules = scm_cons (mod, anonymous_modules);
+#endif
- SCM obarr= SCM_MODULE_OBARRAY(src);
- scm_internal_hash_fold ((Hash_cl_func) &define_one_var, (void*) dest, SCM_EOL, obarr);
+ return mod;
}
SCM
-accumulate_symbol (void * closure, SCM key, SCM val, SCM result)
+ly_use_module (SCM mod, SCM used)
{
- return scm_cons (key, result);
+ SCM expr
+ = scm_list_3 (ly_symbol2scm ("module-use!"),
+ mod,
+ scm_list_2 (ly_symbol2scm ("module-public-interface"),
+ used));
+
+ return scm_eval (expr, global_lily_module);
}
+#define FUNC_NAME __FUNCTION__
+
+
+
SCM
ly_module_symbols (SCM mod)
{
SCM_VALIDATE_MODULE (1, mod);
-
- SCM obarr= SCM_MODULE_OBARRAY(mod);
- return scm_internal_hash_fold ((Hash_cl_func) &accumulate_symbol, NULL, SCM_EOL, obarr);
+
+ SCM obarr = SCM_MODULE_OBARRAY (mod);
+ return ly_hash_table_keys (obarr);
}
-SCM
-entry_to_alist (void * closure, SCM key, SCM val, SCM result)
+static SCM
+entry_to_alist (void *closure, SCM key, SCM val, SCM result)
{
- return scm_cons (scm_cons (key, scm_variable_ref (val)), result);
+ (void) closure;
+ if (scm_variable_bound_p (val) == SCM_BOOL_T)
+ return scm_cons (scm_cons (key, scm_variable_ref (val)), result);
+ programming_error ("unbound variable in module");
+ return result;
}
-SCM
-ly_module_to_alist (SCM mod)
+LY_DEFINE (ly_module_2_alist, "ly:module->alist",
+ 1, 0, 0, (SCM mod),
+ "Dump the contents of module @var{mod} as an alist.")
{
SCM_VALIDATE_MODULE (1, mod);
-
-
- SCM obarr= SCM_MODULE_OBARRAY(mod);
+ SCM obarr = SCM_MODULE_OBARRAY (mod);
- return scm_internal_hash_fold ((Hash_cl_func) &entry_to_alist, NULL, SCM_EOL, obarr);
+ return scm_internal_hash_fold ((Hash_closure_function) & entry_to_alist, NULL, SCM_EOL, obarr);
}
-/*
- Lookup SYM, but don't give error when it is not defined.
- */
-SCM
-ly_module_lookup (SCM module, SCM sym)
+void
+ly_export (SCM module, SCM namelist)
{
-#define FUNC_NAME __FUNCTION__
- SCM_VALIDATE_MODULE (1, module);
+ static SCM export_function;
+ if (!export_function)
+ export_function = scm_permanent_object (scm_c_lookup ("module-export!"));
+
+ scm_call_2 (SCM_VARIABLE_REF (export_function), module, namelist);
+}
- return scm_sym2var (sym, scm_module_lookup_closure (module), SCM_BOOL_F);
-#undef FUNC_NAME
+void
+ly_reexport_module (SCM mod)
+{
+ ly_export (mod, ly_module_symbols (mod));
}
-SCM export_function;
+#ifdef MODULE_GC_KLUDGE
+static SCM
+redefine_keyval (void *closure, SCM key, SCM val, SCM result)
+{
+ (void)closure;
+ SCM new_tab = result;
+ scm_hashq_set_x (new_tab, key, val);
+ return new_tab;
+}
+/*
+ UGH UGH.
+ Kludge for older GUILE 1.6 versions.
+*/
void
-ly_export (SCM module, SCM namelist)
+make_stand_in_procs_weak ()
{
- if (!export_function)
+ /*
+ Ugh, ABI breakage for 1.6.5: scm_stand_in_procs is a hashtab from
+ 1.6.5 on.
+ */
+ if (scm_is_pair (scm_stand_in_procs))
{
- export_function = scm_permanent_object (scm_c_lookup ("module-export!"));
+ return;
}
+
+ if (scm_weak_key_hash_table_p (scm_stand_in_procs) == SCM_BOOL_T)
+ {
+#if (SCM_MINOR_VERSION == 7)
+ perform_gc_kludge = false;
+#endif
+ return;
+ }
+
- scm_call_2 (SCM_VARIABLE_REF (export_function),
- module, namelist);
-}
+ perform_gc_kludge = true;
+
+
+ SCM old_tab = scm_stand_in_procs;
+ SCM new_tab = scm_make_weak_key_hash_table (scm_from_int (257));
-void
-ly_reexport_module (SCM mod)
-{
- ly_export (mod, ly_module_symbols (mod));
+ new_tab = scm_internal_hash_fold ((Hash_closure_function) & redefine_keyval,
+ NULL,
+ new_tab,
+ old_tab);
+
+ scm_stand_in_procs = new_tab;
}
+
+ADD_SCM_INIT_FUNC (make_stand_in_procs_weak, make_stand_in_procs_weak);
+#endif
projects / lilypond.git / blobdiff