X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fly-module.cc;h=7d613fcdd8ad87251ff29bacb433f05c515026c3;hb=0d3c78505a6adb958f9280509bb7fa170de54611;hp=f3f0c528b3469b6ea5d199cc1f0bb58e80b58767;hpb=c0ba46b982f0bb0544c5267b5176c17d8d9d1447;p=lilypond.git

diff --git a/lily/ly-module.cc b/lily/ly-module.cc
index f3f0c528b3..7d613fcdd8 100644
--- a/lily/ly-module.cc
+++ b/lily/ly-module.cc
@@ -1,39 +1,38 @@
 /*
-  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"
 
 #define FUNC_NAME __FUNCTION__
 
-static int module_count;
-
-void
-ly_init_anonymous_module (void *data)
-{
-  (void) data;
-}
-
 SCM
 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);
+      SCM maker = ly_lily_module_constant ("make-module");
+
+      SCM scm_module = ly_lily_module_constant ("the-scm-module");
+      
+      mod = scm_call_0 (maker);
+      scm_module_define (mod, ly_symbol2scm ("%module-public-interface"),
+			 mod);
+      
+      ly_use_module (mod, scm_module);
       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;
@@ -47,7 +46,7 @@ ly_use_module (SCM mod, SCM used)
 		  mod,
 		  scm_list_2 (ly_symbol2scm ("module-public-interface"),
 			      used));
-  
+
   return scm_eval (expr, global_lily_module);
 }
 
@@ -64,19 +63,19 @@ module_define_closure_func (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) ();
 
 /*
   If a variable in changed in SRC, we DEST doesn't see the
   definitions.
- */
+*/
 LY_DEFINE (ly_module_copy, "ly:module-copy",
 	   2, 0, 0, (SCM dest, SCM src),
 	   "Copy all bindings from module SRC into DEST.")
 {
   SCM_VALIDATE_MODULE (1, src);
-  scm_internal_hash_fold ((Hash_cl_func) &module_define_closure_func,
-			  (void*) dest,
+  scm_internal_hash_fold ((Hash_cl_func) & module_define_closure_func,
+			  (void *) dest,
 			  SCM_EOL, SCM_MODULE_OBARRAY (src));
   return SCM_UNSPECIFIED;
 }
@@ -93,25 +92,20 @@ 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;
-  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;
-    }
+  if (scm_variable_bound_p (val) == SCM_BOOL_T)
+    return scm_cons (scm_cons (key, scm_variable_ref (val)), result);
+  programming_error ("unbound variable in module");
+  return result;
 }
 
 LY_DEFINE (ly_module2alist, "ly:module->alist",
@@ -119,9 +113,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.  */
@@ -149,7 +143,7 @@ LY_DEFINE (ly_modules_lookup, "ly:modules-lookup",
       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);
+	return scm_variable_ref (v);
     }
 
   if (def != SCM_UNDEFINED)
@@ -163,7 +157,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);
 }