#include "file-path.hh"
#include "international.hh"
#include "lily-lexer.hh"
-#include "ly-module.hh"
#include "main.hh"
#include "program-option.hh"
#include "sources.hh"
#include "warn.hh"
+#include "lily-imports.hh"
LY_DEFINE (ly_parse_file, "ly:parse-file",
1, 0, 0, (SCM name),
"Return the lexer for @var{parser}, defaulting to current parser")
{
if (SCM_UNBNDP (parser))
- parser = scm_fluid_ref (ly_lily_module_constant ("%parser"));
+ parser = scm_fluid_ref (Lily::f_parser);
Lily_parser *p = LY_ASSERT_SMOB (Lily_parser, parser, 1);
return p->lexer_->self_scm ();
}
" lexical environment. If @var{location} is a valid location,"
" it becomes the source of all music expressions inside.")
{
- SCM parser = scm_fluid_ref (ly_lily_module_constant("%parser"));
+ SCM parser = scm_fluid_ref (Lily::f_parser);
Lily_parser *p = LY_ASSERT_SMOB (Lily_parser, parser, 0);
if (SCM_UNBNDP (closures))
2, 0, 0, (SCM symbol, SCM val),
"Bind @var{symbol} to @var{val} in current parser's module.")
{
- SCM parser = scm_fluid_ref (ly_lily_module_constant ("%parser"));
+ SCM parser = scm_fluid_ref (Lily::f_parser);
Lily_parser *p = LY_ASSERT_SMOB (Lily_parser, parser, 0);
LY_ASSERT_TYPE (ly_is_symbol, symbol, 1);
"Look up @var{symbol} in current parser's module."
" Return @code{'()} if not defined.")
{
- SCM parser = scm_fluid_ref (ly_lily_module_constant ("%parser"));
+ SCM parser = scm_fluid_ref (Lily::f_parser);
Lily_parser *p = LY_ASSERT_SMOB (Lily_parser, parser, 0);
LY_ASSERT_TYPE (ly_is_symbol, symbol, 1);
" for current parser. Can only be used in immediate"
" Scheme expressions (@code{$} instead of @code{#}).")
{
- SCM parser = scm_fluid_ref (ly_lily_module_constant ("%parser"));
+ SCM parser = scm_fluid_ref (Lily::f_parser);
Lily_parser *p = LY_ASSERT_SMOB (Lily_parser, parser, 0);
LY_ASSERT_TYPE (scm_is_string, ly_code, 1);
" @var{names} is an alist of symbols. This only has effect"
" if the current mode is notes.")
{
- SCM parser = scm_fluid_ref (ly_lily_module_constant ("%parser"));
+ SCM parser = scm_fluid_ref (Lily::f_parser);
Lily_parser *p = LY_ASSERT_SMOB (Lily_parser, parser, 0);
if (p->lexer_->is_note_state ())
"Return the base name of the output file. If @code{parser} is left off, use currently active parser.")
{
if (SCM_UNBNDP (parser))
- parser = scm_fluid_ref (ly_lily_module_constant ("%parser"));
+ parser = scm_fluid_ref (Lily::f_parser);
Lily_parser *p = LY_ASSERT_SMOB (Lily_parser, parser, 1);
"Display an error message and make current parser fail."
" Without a current parser, trigger an ordinary error.")
{
- SCM parser = scm_fluid_ref (ly_lily_module_constant ("%parser"));
+ SCM parser = scm_fluid_ref (Lily::f_parser);
Lily_parser *p = unsmob<Lily_parser> (parser);
"Clear error flag for @var{parser}, defaulting to current parser.")
{
if (SCM_UNBNDP (parser))
- parser = scm_fluid_ref (ly_lily_module_constant ("%parser"));
+ parser = scm_fluid_ref (Lily::f_parser);
Lily_parser *p = LY_ASSERT_SMOB (Lily_parser, parser, 1);
"Does @var{parser} (defaulting to current parser) have an error flag?")
{
if (SCM_UNBNDP (parser))
- parser = scm_fluid_ref (ly_lily_module_constant ("%parser"));
+ parser = scm_fluid_ref (Lily::f_parser);
Lily_parser *p = LY_ASSERT_SMOB (Lily_parser, parser, 1);
return scm_from_bool (p->error_level_ || p->lexer_->error_level_);