-/*
-ly-module.cc -- implement guile module stuff.
-
-source file of the GNU LilyPond music typesetter
+/*
+ This file is part of LilyPond, the GNU music typesetter.
-(c) 2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ Copyright (C) 2002--2015 Han-Wen Nienhuys <hanwen@xs4all.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.
-#include "string.hh"
-#include "lily-guile.hh"
-#include "ly-modules.hh"
+ 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.
-static int module_count;
+ You should have received a copy of the GNU General Public License
+ along with LilyPond. If not, see <http://www.gnu.org/licenses/>.
+*/
-void
-ly_init_anonymous_module (void * data)
-{
- scm_c_use_module ("lily");
-}
+#include "lily-guile.hh"
+#include "ly-module.hh"
+#include "warn.hh"
+#include "main.hh"
+#include "protected-scm.hh"
+#include "lily-imports.hh"
SCM
-ly_make_anonymous_module ()
+ly_make_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)
+ {
+ /* Look up (evaluate) Scheme make-module function and call it */
+
+ mod = Guile_user::make_module ();
+ /*
+ Look up and call Guile module-export-all! or, when using
+ Guile V1.8, the compatible shim defined in lily.scm.
+ */
+#if GUILEV2
+ Guile_user::module_export_all_x (mod);
+#else
+ Lily::module_export_all_x (mod);
+#endif
+
+ /*
+ 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
+ */
+
+ ly_use_module (mod, Guile_user::the_root_module);
+ ly_use_module (mod, Lily::module);
+ }
+ else
+ {
+ /* Evaluate and call make-safe-lilypond-module */
+ mod = Lily::make_safe_lilypond_module ();
+ }
+
return mod;
}
-void
-ly_copy_module_variables (SCM dest, SCM src)
+SCM
+ly_use_module (SCM mod, SCM used)
{
- SCM obarr= SCM_MODULE_OBARRAY(src);
- SCM syms = SCM_EOL;
-
- for (int i = 0; i < SCM_VECTOR_LENGTH (obarr); i++)
- {
- for( SCM s = scm_vector_ref(obarr, SCM_MAKINUM (i));
- gh_pair_p (s); s = gh_cdr (s))
- {
- scm_module_define (dest, gh_caar (s), scm_variable_ref (gh_cdar(s)));
- }
- }
+ /*
+ Pick up the module's interface definition.
+ TODO - Replace inline evaluations (interpreted)
+ with guile API calls if these become available.
+ */
+ /*
+ Set up to interpret
+ '(module_use! <mod> (module-public-interface <used>))'
+ */
+ return Guile_user::module_use_x (mod,
+ Guile_user::module_public_interface (used));
}
+#define FUNC_NAME __FUNCTION__
+
SCM
ly_module_symbols (SCM mod)
{
- SCM obarr= SCM_MODULE_OBARRAY(mod);
- SCM syms = SCM_EOL;
+ SCM_VALIDATE_MODULE (1, mod);
- for (int i = 0; i < SCM_VECTOR_LENGTH (obarr); i++)
- {
- for( SCM s = scm_vector_ref(obarr, SCM_MAKINUM (i));
- gh_pair_p (s); s = gh_cdr (s))
- {
- syms = scm_cons (gh_caar (s), syms);
- }
- }
- return syms;
+ 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 obarr= SCM_MODULE_OBARRAY(mod);
- SCM alist = SCM_EOL;
-
- for (int i = 0; i < SCM_VECTOR_LENGTH (obarr); i++)
- {
- for( SCM s = scm_vector_ref(obarr, SCM_MAKINUM (i));
- gh_pair_p (s); s = gh_cdr (s))
- {
- alist = scm_acons (gh_caar (s), scm_variable_ref (gh_cdar (s)),
- alist);
- }
- }
- return alist;
+ if (to_boolean (scm_variable_bound_p (val)))
+ 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.")
{
- SCM var;
-#define FUNC_NAME __FUNCTION__
- SCM_VALIDATE_MODULE (1, module);
+ SCM_VALIDATE_MODULE (1, mod);
+ SCM obarr = SCM_MODULE_OBARRAY (mod);
- var = scm_sym2var (sym, scm_module_lookup_closure (module), SCM_BOOL_F);
- return var;
+ 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)
{
- if (!export_function)
- {
- export_function = scm_permanent_object (scm_c_lookup ("module-export!"));
- }
-
- scm_call_2 (SCM_VARIABLE_REF (export_function),
- module, namelist);
+ Guile_user::module_export_x (module, namelist);
}
void
projects / lilypond.git / blobdiff