* lily/modified-font-metric.cc (text_dimension): try

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

diff --git a/lily/ly-module.cc b/lily/ly-module.cc
index 4ee3c5d273035fe524c3f424e80dad46b73c8a64..c8ccf10d74a7bc914950bcd53d7df8ed6e0da126 100644 (file)
--- a/lily/ly-module.cc
+++ b/lily/ly-module.cc
@@ -6,11 +6,10 @@
   (c) 2002--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
+#include "ly-module.hh"
+#include "warn.hh"
 #include "main.hh"
 #include "string.hh"
-#include "lily-guile.hh"
-#include "ly-module.hh"
-#include "protected-scm.hh"
 
 #define FUNC_NAME __FUNCTION__
 
@@ -34,7 +33,7 @@ ly_make_anonymous_module (bool safe)
     }
   else
     {
-      SCM proc = ly_scheme_function ("make-safe-lilypond-module");
+      SCM proc = ly_lily_module_constant ("make-safe-lilypond-module");
       mod = scm_call_0 (proc);
     }
   return mod;
@@ -55,7 +54,7 @@ ly_use_module (SCM mod, SCM used)
 #define FUNC_NAME __FUNCTION__
 
 static SCM
-ly_module_define (void *closure, SCM key, SCM val, SCM result)
+module_define_closure_func (void *closure, SCM key, SCM val, SCM result)
 {
   (void) result;
   SCM module = (SCM) closure;
@@ -68,18 +67,16 @@ ly_module_define (void *closure, SCM key, SCM val, SCM result)
 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",
+LY_DEFINE (ly_module_copy, "ly:module-copy",
           2, 0, 0, (SCM dest, SCM src),
-          "Import all bindings from module SRC into DEST.")
+          "Copy 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_internal_hash_fold ((Hash_cl_func) &module_define_closure_func,
+                         (void*) dest,
                          SCM_EOL, SCM_MODULE_OBARRAY (src));
   return SCM_UNSPECIFIED;
 }
@@ -97,7 +94,7 @@ ly_module_symbols (SCM mod)
 {
   SCM_VALIDATE_MODULE (1, mod);
   
-  SCM obarr= SCM_MODULE_OBARRAY (mod);
+  SCM obarr = SCM_MODULE_OBARRAY (mod);
   return scm_internal_hash_fold ((Hash_cl_func) &accumulate_symbol,
                                 NULL, SCM_EOL, obarr); 
 }
@@ -106,7 +103,15 @@ static SCM
 entry_to_alist (void *closure, SCM key, SCM val, SCM result)
 {
   (void) closure;
-  return scm_cons (scm_cons (key, scm_variable_ref (val)), result);
+  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;
+    }
 }
 
 LY_DEFINE (ly_module2alist, "ly:module->alist",
@@ -114,7 +119,7 @@ LY_DEFINE (ly_module2alist, "ly:module->alist",
           "Dump the contents of  module @var{mod} as an alist.")
 {
   SCM_VALIDATE_MODULE (1, mod);
-  SCM obarr= SCM_MODULE_OBARRAY (mod);
+  SCM obarr = SCM_MODULE_OBARRAY (mod);
 
   return scm_internal_hash_fold ((Hash_cl_func) &entry_to_alist, NULL, SCM_EOL, obarr); 
 }
@@ -141,11 +146,10 @@ LY_DEFINE (ly_modules_lookup, "ly:modules-lookup",
 {
   for (SCM s = modules; scm_is_pair (s); s = scm_cdr (s))
     {
-      SCM mod = scm_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);
+      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)