X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmodule-scheme.cc;h=eda467fe68b259336663f08ccfaf72f1e2818afb;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=d18e507dcdda6f95504defe09ba2737c63f3ea8b;hpb=b89b87d14b6a5b32f46ecdf10dfa0d023a34d3a2;p=lilypond.git

diff --git a/lily/module-scheme.cc b/lily/module-scheme.cc
index d18e507dcd..eda467fe68 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--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2005--2015 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
@@ -33,8 +33,8 @@ module_define_closure_func (void *closure,
                             SCM val,
                             SCM /* result */)
 {
-  SCM module = (SCM) closure;
-  if (scm_variable_bound_p (val) == SCM_BOOL_T)
+  SCM module = *static_cast<SCM *> (closure);
+  if (to_boolean (scm_variable_bound_p (val)))
     scm_module_define (module, key, scm_variable_ref (val));
   return SCM_EOL;
 }
@@ -46,7 +46,7 @@ LY_DEFINE (ly_module_copy, "ly:module-copy",
 #define FUNC_NAME __FUNCTION__
   SCM_VALIDATE_MODULE (1, src);
   scm_internal_hash_fold ((scm_t_hash_fold_fn) &module_define_closure_func,
-                          (void *) dest,
+                          static_cast<void *> (&dest),
                           SCM_EOL, SCM_MODULE_OBARRAY (src));
   return SCM_UNSPECIFIED;
 }
@@ -67,13 +67,12 @@ ly_module_lookup (SCM module, SCM sym)
 /*
   Issue 2758:
     Guile V2 onward has a scm_module_variable API module.
-    Guile V1.8.7 only has a (module-variable) REPL function.
-    Replace previous code using undocumented API calls deprecated
-      in Guile V2.
+    Guile V1.8.7 only has a (module-variable) REPL function and we
+    can't import this via Scm_variable since that needs
+    ly_module_lookup itself.
  */
 #if GUILEV1
-  static SCM module_variable_func = ly_lily_module_constant ("module-variable");
-  return scm_call_2 (module_variable_func, module, sym);
+  return scm_sym2var (sym, scm_module_lookup_closure (module), SCM_BOOL_F);
 #else
   return scm_module_variable (module, sym);
 #endif
@@ -93,11 +92,11 @@ 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)
+      if (SCM_VARIABLEP (v) && !SCM_UNBNDP (SCM_VARIABLE_REF (v)))
         return scm_variable_ref (v);
     }
 
-  if (def != SCM_UNDEFINED)
+  if (!SCM_UNBNDP (def))
     return def;
   return SCM_BOOL_F;
 }