X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmodule-scheme.cc;h=bcea57a6fd719ca9f9fe82f859d1c171201752be;hb=f20551647f4502bf0c7d0dd1fdc1831e3493e24e;hp=192fcf49664d0a08f2fdba8c09d1eead7db3d2c1;hpb=bc95f4434f760d41191341ab4508b2064eb19025;p=lilypond.git

diff --git a/lily/module-scheme.cc b/lily/module-scheme.cc
index 192fcf4966..bcea57a6fd 100644
--- a/lily/module-scheme.cc
+++ b/lily/module-scheme.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2005--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2005--2011 Han-Wen Nienhuys <hanwen@xs4all.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
@@ -23,7 +23,6 @@
 #include "main.hh"
 #include "std-string.hh"
 
-
 /*
   If a variable is changed in SRC, then DEST doesn't see the
   definitions.
@@ -31,9 +30,9 @@
 
 static SCM
 module_define_closure_func (void *closure,
-			    SCM key,
-			    SCM val,
-			    SCM /* result */)
+                            SCM key,
+                            SCM val,
+                            SCM /* result */)
 {
   SCM module = (SCM) closure;
   if (scm_variable_bound_p (val) == SCM_BOOL_T)
@@ -42,26 +41,14 @@ module_define_closure_func (void *closure,
 }
 
 LY_DEFINE (ly_module_copy, "ly:module-copy",
-	   2, 0, 0, (SCM dest, SCM src),
-	   "Copy all bindings from module @var{src} into @var{dest}.")
+           2, 0, 0, (SCM dest, SCM src),
+           "Copy all bindings from module @var{src} into @var{dest}.")
 {
 #define FUNC_NAME __FUNCTION__
   SCM_VALIDATE_MODULE (1, src);
-  scm_internal_hash_fold ((Hash_closure_function) & module_define_closure_func,
-			  (void *) dest,
-			  SCM_EOL, SCM_MODULE_OBARRAY (src));
-  return SCM_UNSPECIFIED;
-}
-
-LY_DEFINE (ly_clear_anonymous_modules, "ly:clear-anonymous-modules",
-	   0, 0, 0, (),
-	   "Plug a GUILE 1.6 and 1.7 memory leak by breaking a weak"
-	   " reference pointer cycle explicitly.")
-{
-#ifdef MODULE_GC_KLUDGE
-  clear_anonymous_modules ();
-#endif
-
+  scm_internal_hash_fold ((scm_t_hash_fold_fn) &module_define_closure_func,
+                          (void *) dest,
+                          SCM_EOL, SCM_MODULE_OBARRAY (src));
   return SCM_UNSPECIFIED;
 }
 
@@ -79,18 +66,18 @@ ly_module_lookup (SCM module, SCM sym)
 /* Lookup SYM in a list of modules, which do not have to be related.
    Return the first instance. */
 LY_DEFINE (ly_modules_lookup, "ly:modules-lookup",
-	   2, 1, 0,
-	   (SCM modules, SCM sym, SCM def),
-	   "Look up @var{sym} in the list @var{modules},"
-	   " returning the first occurence.  If not found, return"
-	   " @var{def} or @code{#f} if @var{def} isn't specified.")
+           2, 1, 0,
+           (SCM modules, SCM sym, SCM def),
+           "Look up @var{sym} in the list @var{modules},"
+           " returning the first occurence.  If not found, return"
+           " @var{def} or @code{#f} if @var{def} isn't specified.")
 {
   for (SCM s = modules; scm_is_pair (s); s = scm_cdr (s))
     {
       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)