X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fly-module.cc;h=7a6441036410d02f7b3dfe93951486b6236438cf;hb=5d6b0104ce22f859eb46b684b785e19bb05ac96a;hp=0fed4234f6f203a874314af68370ac14657af0ad;hpb=fe84e791fec9ba0ef3d57abbaa643474365a2ba1;p=lilypond.git diff --git a/lily/ly-module.cc b/lily/ly-module.cc index 0fed4234f6..7a64410364 100644 --- a/lily/ly-module.cc +++ b/lily/ly-module.cc @@ -1,133 +1,143 @@ -/* -ly-module.cc -- implement guile module stuff. +/* + This file is part of LilyPond, the GNU music typesetter. + + Copyright (C) 2002--2010 Han-Wen Nienhuys -source file of the GNU LilyPond music typesetter + LilyPond is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. -(c) 2002--2003 Han-Wen Nienhuys + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. - */ + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . +*/ -#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"); -} +#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); + } + } -Protected_scm anon_modules; + anonymous_modules = SCM_EOL; +#endif +} SCM -ly_make_anonymous_module () +ly_make_anonymous_module (bool safe) { - String s = "*anonymous-ly-" + to_string (module_count++) + "*"; - SCM mod = scm_c_define_module (s.to_str0(), ly_init_anonymous_module, 0); + SCM mod = SCM_EOL; + if (!safe) + { + SCM maker = ly_lily_module_constant ("make-module"); - anon_modules = scm_cons (mod, anon_modules); - return mod; -} + SCM scm_module = ly_lily_module_constant ("the-scm-module"); -void -ly_clear_anonymous_modules () -{ - SCM s = anon_modules; - anon_modules = SCM_EOL; - - for (; gh_pair_p (s) ; s = gh_cdr (s)) + mod = scm_call_0 (maker); + scm_module_define (mod, ly_symbol2scm ("%module-public-interface"), + mod); + + ly_use_module (mod, scm_module); + ly_use_module (mod, global_lily_module); + } + else { - SCM tab= scm_c_make_hash_table (2); - /* - UGH. - */ - - SCM_STRUCT_DATA(gh_car(s))[scm_module_index_obarray] = (long unsigned int) tab; + SCM proc = ly_lily_module_constant ("make-safe-lilypond-module"); + mod = scm_call_0 (proc); } -} -#define FUNC_NAME __FUNCTION__ +#ifdef MODULE_GC_KLUDGE + if (perform_gc_kludge) + anonymous_modules = scm_cons (mod, anonymous_modules); +#endif -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; + return mod; } -typedef SCM (*Hash_cl_func)(); - -void -ly_copy_module_variables (SCM dest, SCM src) +SCM +ly_use_module (SCM mod, SCM used) { - SCM_VALIDATE_MODULE (1, src); + SCM expr + = scm_list_3 (ly_symbol2scm ("module-use!"), + mod, + scm_list_2 (ly_symbol2scm ("module-public-interface"), + used)); - SCM obarr= SCM_MODULE_OBARRAY(src); - scm_internal_hash_fold ((Hash_cl_func) &define_one_var, (void*) dest, SCM_EOL, obarr); + return scm_eval (expr, global_lily_module); } -SCM -accumulate_symbol (void * closure, SCM key, SCM val, SCM result) -{ - return scm_cons (key, result); -} +#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 -entry_to_alist (void * closure, SCM key, SCM val, SCM result) -{ - return scm_cons (scm_cons (key, scm_variable_ref (val)), result); + SCM obarr = SCM_MODULE_OBARRAY (mod); + return ly_hash_table_keys (obarr); } -SCM -ly_module_to_alist (SCM mod) +static SCM +entry_to_alist (void * /* closure */, + SCM key, + SCM val, + SCM result) { - SCM_VALIDATE_MODULE (1, mod); - - - SCM obarr= SCM_MODULE_OBARRAY(mod); - - return scm_internal_hash_fold ((Hash_cl_func) &entry_to_alist, NULL, SCM_EOL, obarr); + 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; } -/* - Lookup SYM, but don't give error when it is not defined. - */ -SCM -ly_module_lookup (SCM module, SCM sym) +LY_DEFINE (ly_module_2_alist, "ly:module->alist", + 1, 0, 0, (SCM mod), + "Dump the contents of module @var{mod} as an alist.") { -#define FUNC_NAME __FUNCTION__ - SCM_VALIDATE_MODULE (1, module); + SCM_VALIDATE_MODULE (1, mod); + SCM obarr = SCM_MODULE_OBARRAY (mod); - return scm_sym2var (sym, scm_module_lookup_closure (module), SCM_BOOL_F); + return scm_internal_hash_fold ((scm_t_hash_fold_fn) &entry_to_alist, + NULL, SCM_EOL, obarr); } -SCM export_function ; - void ly_export (SCM module, SCM namelist) { + 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); + export_function = scm_permanent_object (scm_c_lookup ("module-export!")); + + scm_call_2 (SCM_VARIABLE_REF (export_function), module, namelist); } void