X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fly-module.cc;h=621b65afe01b3ee11b9e3b93aa66d3649f3be915;hb=516e9453510ac0e9db8e459904c1fc868a5e9d57;hp=87ac7987887b0dbce285485fab3570fde2187daa;hpb=2c22efe5a46a37065b10c3f51c5d7db00d07d318;p=lilypond.git

diff --git a/lily/ly-module.cc b/lily/ly-module.cc
index 87ac798788..621b65afe0 100644
--- a/lily/ly-module.cc
+++ b/lily/ly-module.cc
@@ -1,24 +1,37 @@
 /*
-  ly-module.cc -- implement guile module stuff.
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2002--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2002--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #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))
@@ -35,6 +48,7 @@ clear_anonymous_modules ()
     }
 
   anonymous_modules = SCM_EOL;
+#endif
 }
 
 SCM
@@ -61,7 +75,8 @@ 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;
@@ -82,13 +97,6 @@ ly_use_module (SCM mod, SCM used)
 #define FUNC_NAME __FUNCTION__
 
 
-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)
@@ -96,23 +104,24 @@ 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
-entry_to_alist (void *closure, SCM key, SCM val, SCM result)
+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);
   programming_error ("unbound variable in module");
   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.")
+	   "Dump the contents of module @var{mod} as an alist.")
 {
   SCM_VALIDATE_MODULE (1, mod);
   SCM obarr = SCM_MODULE_OBARRAY (mod);
@@ -136,12 +145,13 @@ 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)
+redefine_keyval (void * /* closure */,
+		 SCM key,
+		 SCM val,
+		 SCM result)
 {
-  (void)closure;
   SCM new_tab = result;
   scm_hashq_set_x (new_tab, key, val);
   return new_tab;
@@ -154,6 +164,27 @@ redefine_keyval (void *closure, SCM key, SCM val, SCM result)
 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));