X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fly-module.cc;h=581984dfe9951495bd4320684d8d1f562784ae94;hb=f5bd2652cb823c213504742c48616f41c52ccc8a;hp=b2d04f4185157bdfc3d8137501d15b48dd8f6b90;hpb=878e94c966d1eb7104be133611566564e2edeb8b;p=lilypond.git

diff --git a/lily/ly-module.cc b/lily/ly-module.cc
index b2d04f4185..581984dfe9 100644
--- a/lily/ly-module.cc
+++ b/lily/ly-module.cc
@@ -3,30 +3,31 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2002--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2002--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "lily-guile.hh"
 #include "warn.hh"
 #include "main.hh"
-#include "string.hh"
+#include "std-string.hh"
 #include "protected-scm.hh"
 
 #ifdef MODULE_GC_KLUDGE
 Protected_scm anonymous_modules = SCM_EOL;
+bool perform_gc_kludge;
 #endif
 
-
 void
 clear_anonymous_modules ()
 {
+#ifdef MODULE_GC_KLUDGE
   for (SCM s = anonymous_modules;
        scm_is_pair (s);
        s = scm_cdr (s))
     {
       SCM module = scm_car (s);
-      SCM closure = SCM_MODULE_EVAL_CLOSURE(module);
-      SCM prop = scm_procedure_property (closure, ly_symbol2scm ("module")); 
+      SCM closure = SCM_MODULE_EVAL_CLOSURE (module);
+      SCM prop = scm_procedure_property (closure, ly_symbol2scm ("module"));
 
       if (ly_is_module (prop))
 	{
@@ -36,6 +37,7 @@ clear_anonymous_modules ()
     }
 
   anonymous_modules = SCM_EOL;
+#endif
 }
 
 SCM
@@ -47,11 +49,11 @@ ly_make_anonymous_module (bool safe)
       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);
     }
@@ -62,9 +64,10 @@ ly_make_anonymous_module (bool safe)
     }
 
 #ifdef MODULE_GC_KLUDGE
-  anonymous_modules = scm_cons (mod, anonymous_modules);
+  if (perform_gc_kludge)
+    anonymous_modules = scm_cons (mod, anonymous_modules);
 #endif
-  
+
   return mod;
 }
 
@@ -84,22 +87,13 @@ ly_use_module (SCM mod, SCM used)
 
 
 
-static SCM
-accumulate_symbol (void *closure, SCM key, SCM val, SCM result)
-{
-  (void) closure;
-  (void) val;
-  return scm_cons (key, result);
-}
-
 SCM
 ly_module_symbols (SCM mod)
 {
   SCM_VALIDATE_MODULE (1, mod);
 
   SCM obarr = SCM_MODULE_OBARRAY (mod);
-  return scm_internal_hash_fold ((Hash_closure_function) & accumulate_symbol,
-				 NULL, SCM_EOL, obarr);
+  return ly_hash_table_keys (obarr);
 }
 
 static SCM
@@ -112,7 +106,7 @@ entry_to_alist (void *closure, SCM key, SCM val, SCM result)
   return result;
 }
 
-LY_DEFINE (ly_module2alist, "ly:module->alist",
+LY_DEFINE (ly_module_2_alist, "ly:module->alist",
 	   1, 0, 0, (SCM mod),
 	   "Dump the contents of  module @var{mod} as an alist.")
 {
@@ -138,8 +132,6 @@ ly_reexport_module (SCM mod)
   ly_export (mod, ly_module_symbols (mod));
 }
 
-
-
 #ifdef MODULE_GC_KLUDGE
 static SCM
 redefine_keyval (void *closure, SCM key, SCM val, SCM result)
@@ -153,14 +145,35 @@ redefine_keyval (void *closure, SCM key, SCM val, SCM result)
 /*
   UGH UGH.
   Kludge for older GUILE 1.6 versions.
- */
+*/
 void
 make_stand_in_procs_weak ()
 {
+  /*
+    Ugh, ABI breakage for 1.6.5: scm_stand_in_procs is a hashtab from
+    1.6.5 on.
+   */
+  if (scm_is_pair (scm_stand_in_procs))
+    {
+      return; 
+    }
+      
+  if (scm_weak_key_hash_table_p (scm_stand_in_procs) == SCM_BOOL_T)
+    {
+#if (SCM_MINOR_VERSION == 7) 
+      perform_gc_kludge = false;
+#endif
+      return; 
+    }
+
+  
+  perform_gc_kludge = true;
+  
+  
   SCM old_tab = scm_stand_in_procs;
   SCM new_tab = scm_make_weak_key_hash_table (scm_from_int (257));
-  
-  new_tab = scm_internal_hash_fold ((Hash_closure_function) &redefine_keyval,
+
+  new_tab = scm_internal_hash_fold ((Hash_closure_function) & redefine_keyval,
 				    NULL,
 				    new_tab,
 				    old_tab);
@@ -168,5 +181,5 @@ make_stand_in_procs_weak ()
   scm_stand_in_procs = new_tab;
 }
 
-ADD_SCM_INIT_FUNC(make_stand_in_procs_weak, make_stand_in_procs_weak);
+ADD_SCM_INIT_FUNC (make_stand_in_procs_weak, make_stand_in_procs_weak);
 #endif