/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 2005--2014 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
SCM /* result */)
{
SCM module = (SCM) closure;
- if (scm_variable_bound_p (val) == SCM_BOOL_T)
+ if (to_boolean (scm_variable_bound_p (val)))
scm_module_define (module, key, scm_variable_ref (val));
return SCM_EOL;
}
/*
Issue 2758:
Guile V2 onward has a scm_module_variable API module.
- Guile V1.8.7 only has a (module-variable) REPL function, however
- using ly_lily_module_constant ("module-variable") and calling
- the memoized result is slow.
+ 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
return scm_sym2var (sym, scm_module_lookup_closure (module), SCM_BOOL_F);
{
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;
}