X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmodule-scheme.cc;h=4fc43ca32b8c8f846d5373673615ae23a7a9eca8;hb=ce1d0e01ebe3cec6f50902394d5d7226bc516a68;hp=ce08c424567d32a7d45e92bbd0fc79cc01b08d77;hpb=87eedcd59f4082cb0841528ad5bc82cb1d1191e3;p=lilypond.git

diff --git a/lily/module-scheme.cc b/lily/module-scheme.cc
index ce08c42456..4fc43ca32b 100644
--- a/lily/module-scheme.cc
+++ b/lily/module-scheme.cc
@@ -1,9 +1,20 @@
 /*
-  lily/module-scheme.cc -- implement module bindings
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2005--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2005--2007 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
+  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 "ly-module.hh"
@@ -12,16 +23,17 @@
 #include "main.hh"
 #include "std-string.hh"
 
-
 /*
-  If a variable in changed in SRC, we DEST doesn't see the
+  If a variable is changed in SRC, then DEST doesn't see the
   definitions.
 */
 
 static SCM
-module_define_closure_func (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;
   if (scm_variable_bound_p (val) == SCM_BOOL_T)
     scm_module_define (module, key, scm_variable_ref (val));
@@ -29,26 +41,14 @@ module_define_closure_func (void *closure, SCM key, SCM val, SCM result)
 }
 
 LY_DEFINE (ly_module_copy, "ly:module-copy",
-	   2, 0, 0, (SCM dest, SCM src),
-	   "Copy all bindings from module SRC into 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;
 }
 
@@ -66,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),
-	   "Lookup @var{sym} in the list @var{modules}, "
-	   "returning the first occurence.  "
-	   "If not found, return @var{default}, or @code{#f}.")
+           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)