* scm/lily.scm (completize-formats): new function

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

diff --git a/lily/ly-module.cc b/lily/ly-module.cc
index 5125b7762b45b54fe6a010f24855296043536d60..c8ccf10d74a7bc914950bcd53d7df8ed6e0da126 100644 (file)
--- a/lily/ly-module.cc
+++ b/lily/ly-module.cc
@@ -33,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;
@@ -54,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;
@@ -67,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;
 }
@@ -96,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); 
 }
@@ -121,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); 
 }