(scm_from_double): more compat glue.

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

diff --git a/lily/ly-module.cc b/lily/ly-module.cc
index 754e144bfa9dd74b409c55f86a5340e2af9145e9..ab0d15d405b6432ee2c5f7d3d4f1b1884d281a0b 100644 (file)
--- a/lily/ly-module.cc
+++ b/lily/ly-module.cc
@@ -1,10 +1,9 @@
 /*
   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"
@@ -29,16 +28,13 @@ ly_make_anonymous_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);
-
       ly_use_module (mod, global_lily_module);
     }
   else
     {
       SCM proc = ly_scheme_function ("make-safe-lilypond-module");
-
       mod = scm_call_0 (proc);
     }
   return mod;
@@ -71,12 +67,21 @@ ly_module_define (void *closure, SCM key, SCM val, SCM result)
 /* 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
@@ -104,12 +109,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); 
@@ -126,22 +130,28 @@ ly_module_lookup (SCM module, SCM sym)
 #undef FUNC_NAME
 }
 
-/*
-  Lookup SYM in a list of modules, which do not have to be related.
-  Return the first instance.
- */
-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 = ly_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;
-}
 
+  if (def != SCM_UNDEFINED)
+    return def;
+  return SCM_BOOL_F;
+}
 
 void
 ly_export (SCM module, SCM namelist)