release commit

[lilypond.git] / lily / ly-module.cc

diff --git a/lily/ly-module.cc b/lily/ly-module.cc
index 632ea229f403c41864d11dc4a49caa269fc530b9..8286533f50d1f3dab1161d80302b97f82c2d8d15 100644 (file)
--- a/lily/ly-module.cc
+++ b/lily/ly-module.cc
@@ -10,6 +10,9 @@ source file of the GNU LilyPond music typesetter
 #include "string.hh"
 #include "lily-guile.hh"
 #include "ly-modules.hh"
+#include "protected-scm.hh"
+
+#define FUNC_NAME __FUNCTION__
 
 static int module_count;
 
@@ -19,17 +22,37 @@ ly_init_anonymous_module (void * data)
   scm_c_use_module ("lily");  
 }
 
+Protected_scm anon_modules;
+
 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;
 }
 
+void
+ly_clear_anonymous_modules ()
+{
+  SCM s = anon_modules;
+  anon_modules = SCM_EOL;
+
+  for (; gh_pair_p (s) ; s = gh_cdr (s))
+    {
+      scm_vector_fill_x (SCM_MODULE_OBARRAY(gh_car(s)), SCM_EOL);
+    }
+}
+
+#define FUNC_NAME __FUNCTION__
+
 void
 ly_copy_module_variables (SCM dest, SCM src)
 {
+  SCM_VALIDATE_MODULE (1, src);
+
   SCM obarr= SCM_MODULE_OBARRAY(src);
   SCM syms = SCM_EOL;
 
@@ -46,6 +69,8 @@ ly_copy_module_variables (SCM dest, SCM src)
 SCM
 ly_module_symbols (SCM mod)
 {
+  SCM_VALIDATE_MODULE (1, mod);
+  
   SCM obarr= SCM_MODULE_OBARRAY(mod);
   SCM syms = SCM_EOL;
 
@@ -65,6 +90,9 @@ ly_module_symbols (SCM mod)
 SCM
 ly_module_to_alist (SCM mod)
 {
+  SCM_VALIDATE_MODULE (1, mod);
+  
+  
   SCM obarr= SCM_MODULE_OBARRAY(mod);
   SCM alist = SCM_EOL;
 
@@ -86,12 +114,10 @@ ly_module_to_alist (SCM mod)
 SCM
 ly_module_lookup (SCM module, SCM sym)
 {
-  SCM var;
 #define FUNC_NAME __FUNCTION__
   SCM_VALIDATE_MODULE (1, module);
 
-  var = scm_sym2var (sym, scm_module_lookup_closure (module), SCM_BOOL_F);
-  return var;
+  return scm_sym2var (sym, scm_module_lookup_closure (module), SCM_BOOL_F);
 }
 
 SCM export_function ;