/*
- ly-module.cc -- implement guile module stuff.
+ This file is part of LilyPond, the GNU music typesetter.
- source file of the GNU LilyPond music typesetter
+ Copyright (C) 2002--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
- (c) 2002--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ 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.
+
+ 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 <http://www.gnu.org/licenses/>.
*/
-#include "ly-module.hh"
+#include "lily-guile.hh"
#include "warn.hh"
#include "main.hh"
-#include "string.hh"
-
-#define FUNC_NAME __FUNCTION__
-
-static int module_count;
-
-void
-ly_init_anonymous_module (void *data)
-{
- (void) data;
-}
+#include "std-string.hh"
+#include "protected-scm.hh"
SCM
-ly_make_anonymous_module (bool safe)
+ly_make_module (bool safe)
{
SCM mod = SCM_EOL;
if (!safe)
{
- String s = "*anonymous-ly-" + to_string (module_count++) + "*";
- mod = scm_c_define_module (s.to_str0 (), ly_init_anonymous_module, 0);
+ /* Look up (evaluate) Scheme make-module function and call it */
+
+ SCM maker = ly_lily_module_constant ("make-module");
+ mod = scm_call_0 (maker);
+ /*
+ Look up and call Guile module-export-all! or, when using
+ Guile V1.8, the compatible shim defined in lily.scm.
+ */
+ SCM module_export_all_x = ly_lily_module_constant ("module-export-all!");
+ scm_call_1 (module_export_all_x, mod);
+
+ /*
+ Evaluate Guile module "the-root-module",
+ and ensure we inherit definitions from it and the "lily" module
+ N.B. this used to be "the-scm-module" and is deprecated in
+ Guile V1.9/2.0
+ */
+ SCM scm_module = ly_lily_module_constant ("the-root-module");
+ ly_use_module (mod, scm_module);
ly_use_module (mod, global_lily_module);
}
else
{
- SCM proc = ly_scheme_function ("make-safe-lilypond-module");
+ /* Evaluate and call make-safe-lilypond-module */
+ SCM proc = ly_lily_module_constant ("make-safe-lilypond-module");
mod = scm_call_0 (proc);
}
+
return mod;
}
SCM
ly_use_module (SCM mod, SCM used)
{
- SCM expr
- = scm_list_3 (ly_symbol2scm ("module-use!"),
- mod,
- scm_list_2 (ly_symbol2scm ("module-public-interface"),
- used));
-
+ /*
+ Pick up the module's interface definition.
+ TODO - Replace inline evaluations (interpreted)
+ with guile API calls if these become available.
+ */
+ SCM scm_module_use = ly_symbol2scm ("module-use!");
+ SCM scm_module_public_interface = ly_symbol2scm ("module-public-interface");
+ SCM iface = scm_list_2 (scm_module_public_interface, used);
+ /*
+ Set up to interpret
+ '(module_use! <mod> (module-public-interface <used>))'
+ */
+ SCM expr = scm_list_3 (scm_module_use, mod, iface);
+ /*
+ Now return SCM value, this is the result of interpreting
+ '(eval (module-use! <mod> (module-public-interface <used>)) "lily")'
+ */
return scm_eval (expr, global_lily_module);
}
#define FUNC_NAME __FUNCTION__
-static SCM
-ly_module_define (void *closure, SCM key, SCM val, SCM result)
-{
- (void) result;
- SCM module = (SCM) closure;
- if (scm_variable_bound_p (val) == SCM_BOOL_T)
- scm_module_define (module, key, scm_variable_ref (val));
- return SCM_EOL;
-}
-
-/* Ugh signature of scm_internal_hash_fold () is inaccurate. */
-typedef SCM (*Hash_cl_func)();
-
-/*
- Check me. This is NOT an actual import. It just copies the
- definitions.
-
- If a variable in changed in SRC, we DEST doesn't see the
- definitions.
- */
-LY_DEFINE (ly_import_module, "ly:import-module",
- 2, 0, 0, (SCM dest, SCM src),
- "Import all bindings from module SRC into DEST.")
-{
- SCM_VALIDATE_MODULE (1, src);
- scm_internal_hash_fold ((Hash_cl_func) &ly_module_define, (void*) dest,
- SCM_EOL, SCM_MODULE_OBARRAY (src));
- return SCM_UNSPECIFIED;
-}
-
-static SCM
-accumulate_symbol (void *closure, SCM key, SCM val, SCM result)
-{
- (void) closure;
- (void) val;
- return scm_cons (key, result);
-}
-
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);
}
static SCM
-entry_to_alist (void *closure, SCM key, SCM val, SCM result)
+entry_to_alist (void * /* closure */,
+ SCM key,
+ SCM val,
+ SCM result)
{
- (void) closure;
- if (scm_variable_bound_p (val) == SCM_BOOL_T)
- {
- return scm_cons (scm_cons (key, scm_variable_ref (val)), result);
- }
- else
- {
- programming_error ("Unbound variable in module.");
- return result;
- }
+ 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;
}
-LY_DEFINE (ly_module2alist, "ly:module->alist",
- 1, 0, 0, (SCM mod),
- "Dump the contents of module @var{mod} as an alist.")
+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);
-
- return scm_internal_hash_fold ((Hash_cl_func) &entry_to_alist, NULL, SCM_EOL, obarr);
-}
+ SCM obarr = SCM_MODULE_OBARRAY (mod);
-/* Lookup SYM, but don't give error when it is not defined. */
-SCM
-ly_module_lookup (SCM module, SCM sym)
-{
-#define FUNC_NAME __FUNCTION__
- SCM_VALIDATE_MODULE (1, module);
-
- return scm_sym2var (sym, scm_module_lookup_closure (module), SCM_BOOL_F);
-#undef FUNC_NAME
-}
-
-/* Lookup SYM in a list of modules, which do not have to be related.
- Return the first instance. */
-LY_DEFINE (ly_modules_lookup, "ly:modules-lookup",
- 2, 1, 0,
- (SCM modules, SCM sym, SCM def),
- "Lookup @var{sym} in the list @var{modules}, "
- "returning the first occurence. "
- "If not found, return @var{default}, or @code{#f}.")
-{
- for (SCM s = modules; scm_is_pair (s); s = scm_cdr (s))
- {
- SCM mod = scm_car (s);
- SCM v = ly_module_lookup (mod, sym);
- if (SCM_VARIABLEP (v) && SCM_VARIABLE_REF (v) != SCM_UNDEFINED)
- return scm_variable_ref(v);
- }
-
- if (def != SCM_UNDEFINED)
- return def;
- return SCM_BOOL_F;
+ return scm_internal_hash_fold ((scm_t_hash_fold_fn) &entry_to_alist,
+ NULL, SCM_EOL, obarr);
}
void
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);
}
projects / lilypond.git / blobdiff