(before_line_breaking): do not return

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

diff --git a/lily/ly-module.cc b/lily/ly-module.cc
index ea0e7c67f899625ee4345baf2b42dfb3c5d38b81..f90176be4ff8b2dd8a2d7865f0adbc6b891b5f57 100644 (file)
--- a/lily/ly-module.cc
+++ b/lily/ly-module.cc
@@ -1,12 +1,12 @@
 /*
   ly-module.cc --  implement guile module stuff.
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 2002--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 
+  (c) 2002--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
+#include "main.hh"
 #include "string.hh"
 #include "lily-guile.hh"
 #include "ly-module.hh"
@@ -17,36 +17,42 @@
 static int module_count;
 
 void
-ly_init_anonymous_module (void * data)
+ly_init_anonymous_module (void *data)
 {
   (void) data;
-  scm_c_use_module ("lily");
 }
 
-Protected_scm anon_modules;
-
 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);
-  anon_modules = scm_cons (mod, anon_modules);
+  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);
+
+      ly_use_module (mod, global_lily_module);
+    }
+  else
+    {
+      SCM proc = ly_scheme_function ("make-safe-lilypond-module");
+
+      mod = scm_call_0 (proc);
+    }
   return mod;
 }
 
-void
-ly_clear_anonymous_modules ()
+SCM
+ly_use_module (SCM mod, SCM used)
 {
-  SCM s = anon_modules;
-  anon_modules = SCM_EOL;
+  SCM expr
+    = scm_list_3 (ly_symbol2scm ("module-use!"),
+                 mod,
+                 scm_list_2 (ly_symbol2scm ("module-public-interface"),
+                             used));
   
-  for (; gh_pair_p (s) ; s = gh_cdr (s))
-    {
-      SCM tab= scm_c_make_hash_table (2);
-      /* UGH. */
-      SCM_STRUCT_DATA (gh_car (s))[scm_module_index_obarray]
-       = (long unsigned int) tab;
-    }
+  return scm_eval (expr, global_lily_module);
 }
 
 #define FUNC_NAME __FUNCTION__
@@ -56,19 +62,29 @@ ly_module_define (void *closure, SCM key, SCM val, SCM result)
 {
   (void) result;
   SCM module = (SCM) closure;
-  scm_module_define (module, key, scm_variable_ref (val));
+  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)();
 
-void
-ly_import_module (SCM dest, SCM src)
+/*
+  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
@@ -96,12 +112,11 @@ entry_to_alist (void *closure, SCM key, SCM val, SCM result)
   return scm_cons (scm_cons (key, scm_variable_ref (val)), result);
 }
 
-SCM
-ly_module_to_alist (SCM mod)
+LY_DEFINE (ly_module2alist, "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); 
@@ -118,24 +133,33 @@ ly_module_lookup (SCM module, SCM sym)
 #undef FUNC_NAME
 }
 
-SCM
-ly_modules_lookup (SCM modules, SCM sym)
+/* 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 = gh_car (modules); SCM_MODULEP (s); s = ly_cdr (s))
+  for (SCM s = modules; ly_c_pair_p (s); s = ly_cdr (s))
     {
-      SCM v = scm_sym2var (sym, scm_module_lookup_closure (s), SCM_UNDEFINED);
-      if (v != SCM_UNDEFINED)
-       return v;
+      SCM mod = ly_car (s);      
+      SCM v = scm_sym2var (sym, scm_module_lookup_closure (mod),
+                          SCM_UNDEFINED);
+      if (SCM_VARIABLEP(v) && SCM_VARIABLE_REF(v) != SCM_UNDEFINED)
+       return SCM_VARIABLE_REF(v);
     }
-  return SCM_UNDEFINED;
-}
-
 
-SCM export_function;
+  if (def != SCM_UNDEFINED)
+    return def;
+  return SCM_BOOL_F;
+}
 
 void
 ly_export (SCM module, SCM namelist)
 {
+  static SCM export_function;
   if (!export_function)
     export_function = scm_permanent_object (scm_c_lookup ("module-export!"));