X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fly-module.cc;h=fb4d3abd16fae79c0d3f232db111cb091426573c;hb=f0b7ccb46df75c89e1f69dd4ef42ab370f1847fe;hp=bf951abfc5407315504f3e9948d69547ea618bf5;hpb=c659cb200486c2f908703696a1b2873e78c8160a;p=lilypond.git

diff --git a/lily/ly-module.cc b/lily/ly-module.cc
index bf951abfc5..fb4d3abd16 100644
--- a/lily/ly-module.cc
+++ b/lily/ly-module.cc
@@ -1,16 +1,15 @@
 /*
-  ly-module.cc --  implement guile module stuff.
+  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--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-#include "ly-module.hh"
-
+#include "lily-guile.hh"
+#include "warn.hh"
 #include "main.hh"
 #include "string.hh"
-#include "protected-scm.hh"
 
 #define FUNC_NAME __FUNCTION__
 
@@ -28,13 +27,13 @@ ly_make_anonymous_module (bool safe)
   SCM mod = SCM_EOL;
   if (!safe)
     {
-      String s = "*anonymous-ly-" + to_string (module_count++) +  "*";
+      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");
+      SCM proc = ly_lily_module_constant ("make-safe-lilypond-module");
       mod = scm_call_0 (proc);
     }
   return mod;
@@ -48,14 +47,14 @@ ly_use_module (SCM mod, SCM used)
 		  mod,
 		  scm_list_2 (ly_symbol2scm ("module-public-interface"),
 			      used));
-  
+
   return scm_eval (expr, global_lily_module);
 }
 
 #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;
@@ -65,21 +64,19 @@ 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)();
+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;
 }
@@ -96,17 +93,25 @@ SCM
 ly_module_symbols (SCM mod)
 {
   SCM_VALIDATE_MODULE (1, mod);
-  
-  SCM obarr= SCM_MODULE_OBARRAY (mod);
-  return scm_internal_hash_fold ((Hash_cl_func) &accumulate_symbol,
-				 NULL, SCM_EOL, obarr); 
+
+  SCM obarr = SCM_MODULE_OBARRAY (mod);
+  return scm_internal_hash_fold ((Hash_cl_func) & accumulate_symbol,
+				 NULL, SCM_EOL, obarr);
 }
 
 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,9 +119,9 @@ 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); 
+  return scm_internal_hash_fold ((Hash_cl_func) & entry_to_alist, NULL, SCM_EOL, obarr);
 }
 
 /* Lookup SYM, but don't give error when it is not defined.  */
@@ -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)
@@ -159,7 +163,7 @@ ly_export (SCM module, SCM namelist)
   static SCM export_function;
   if (!export_function)
     export_function = scm_permanent_object (scm_c_lookup ("module-export!"));
-  
+
   scm_call_2 (SCM_VARIABLE_REF (export_function), module, namelist);
 }