/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 1997--2014 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
{"drums", DRUMS},
{"figuremode", FIGUREMODE},
{"figures", FIGURES},
- {"grobdescriptions", GROBDESCRIPTIONS},
{"header", HEADER},
- {"key", KEY},
{"layout", LAYOUT},
{"lyricmode", LYRICMODE},
{"lyrics", LYRICS},
{"lyricsto", LYRICSTO},
- {"mark", MARK},
{"markup", MARKUP},
{"markuplist", MARKUPLIST},
{"midi", MIDI},
{"name", NAME},
{"new", NEWCONTEXT},
{"notemode", NOTEMODE},
- {"once", ONCE},
{"override", OVERRIDE},
{"paper", PAPER},
{"remove", REMOVE},
{"set", SET},
{"simultaneous", SIMULTANEOUS},
{"tempo", TEMPO},
- {"time", TIME_T},
- {"times", TIMES},
{"type", TYPE},
{"unset", UNSET},
{"with", WITH},
scopes_ = SCM_EOL;
error_level_ = 0;
is_main_input_ = false;
+ main_input_level_ = 0;
start_module_ = SCM_EOL;
- chord_repetition_ = Chord_repetition ();
extra_tokens_ = SCM_EOL;
smobify_self ();
add_scope (ly_make_module (false));
- push_note_state (scm_c_make_hash_table (0));
+ push_note_state (SCM_EOL);
chordmodifier_tab_ = scm_make_vector (scm_from_int (1), SCM_EOL);
}
-Lily_lexer::Lily_lexer (Lily_lexer const &src, Lily_parser *parser)
+Lily_lexer::Lily_lexer (Lily_lexer const &src, Lily_parser *parser,
+ SCM override_input)
: Includable_lexer ()
{
parser_ = parser;
chordmodifier_tab_ = src.chordmodifier_tab_;
pitchname_tab_stack_ = src.pitchname_tab_stack_;
sources_ = src.sources_;
+ scopes_ = src.scopes_;
start_module_ = SCM_EOL;
- chord_repetition_ = src.chord_repetition_;
- error_level_ = src.error_level_;
+ error_level_ = 0;
is_main_input_ = src.is_main_input_;
+ main_input_level_ = 0;
- scopes_ = SCM_EOL;
extra_tokens_ = SCM_EOL;
+ if (unsmob_input (override_input))
+ override_input_ = *unsmob_input (override_input);
smobify_self ();
- SCM scopes = SCM_EOL;
- SCM *tail = &scopes;
- for (SCM s = src.scopes_; scm_is_pair (s); s = scm_cdr (s))
- {
- SCM newmod = ly_make_module (false);
- ly_module_copy (newmod, scm_car (s));
- *tail = scm_cons (newmod, SCM_EOL);
- tail = SCM_CDRLOC (*tail);
- }
-
- scopes_ = scopes;
- push_note_state (scm_c_make_hash_table (0));
+ push_note_state (SCM_EOL);
}
Lily_lexer::~Lily_lexer ()
}
int
-Lily_lexer::lookup_keyword (string s)
+Lily_lexer::lookup_keyword (const string &s)
{
return keytable_->lookup (s.c_str ());
}
}
SCM
-Lily_lexer::lookup_identifier (string name)
+Lily_lexer::lookup_identifier (const string &name)
{
return lookup_identifier_symbol (ly_symbol2scm (name.c_str ()));
}
}
void
-Lily_lexer::new_input (string str, string d, Sources *ss)
+Lily_lexer::new_input (const string &str, string d, Sources *ss)
{
Includable_lexer::new_input (str, d, ss);
}
void
-Lily_lexer::new_input (string str, Sources *ss)
+Lily_lexer::new_input (const string &str, Sources *ss)
{
if (is_main_input_ && be_safe_global)
{
return Input (*lexloc_);
}
+Input const &
+Lily_lexer::override_input (Input const &in) const
+{
+ return override_input_.get_source_file ()
+ ? override_input_ : in;
+}
+
void
Lily_lexer::prepare_for_next_token ()
{
SCM
Lily_lexer::mark_smob (SCM s)
{
- ASSERT_LIVE_IS_ALLOWED ();
+ ASSERT_LIVE_IS_ALLOWED (s);
Lily_lexer *lexer = (Lily_lexer *) SCM_CELL_WORD_1 (s);