#include "lily-proto.hh"
#include "scm-hash.hh"
#include "interval.hh"
-#include "input-file-results.hh"
#include "lily-guile.hh"
#include "parser.hh"
#include "keyword.hh"
{"addquote", ADDQUOTE},
{"alias", ALIAS},
{"alternative", ALTERNATIVE},
- {"apply", APPLY},
{"applycontext", APPLYCONTEXT},
{"applyoutput", APPLYOUTPUT},
{"appoggiatura", APPOGGIATURA},
{"autochange", AUTOCHANGE},
{"bar", BAR},
+ {"book", BOOK},
{"breathe", BREATHE},
{"change", CHANGE},
{"chords", CHORDS},
{"header", HEADER},
{"key", KEY},
{"lyrics", LYRICS},
- {"lyricsto", NEWADDLYRICS},
+ {"lyricsto", LYRICSTO},
{"mark", MARK},
{"markup", MARKUP},
{"midi", MIDI},
{"name", NAME},
{"new", NEWCONTEXT},
+ {"newlyrics", NEWLYRICS},
{"notes", NOTES},
{"octave", OCTAVE},
{"once", ONCE},
};
-My_lily_lexer::My_lily_lexer ()
+My_lily_lexer::My_lily_lexer (Sources *sources)
+
{
keytable_ = new Keyword_table (the_key_tab);
encoding_ = SCM_EOL;
chordmodifier_tab_ = scm_make_vector (scm_int2num (1), SCM_EOL);
pitchname_tab_stack_ = SCM_EOL;
-
+ sources_ = sources;
scopes_ = SCM_EOL;
+ error_level_ = 0;
+ main_input_b_ = false;
- add_scope (ly_make_anonymous_module ());
- errorlevel_ = 0;
+ add_scope (ly_make_anonymous_module (safe_global_b));
+}
- main_input_b_ = false;
+My_lily_lexer::My_lily_lexer (My_lily_lexer const &src)
+ : Includable_lexer ()
+{
+ keytable_ = src.keytable_;
+ encoding_ = src.encoding_;
+ chordmodifier_tab_ = src.chordmodifier_tab_;
+ pitchname_tab_stack_ = src.pitchname_tab_stack_;
+ sources_ = src.sources_;
+ scopes_ = src.scopes_;
+ error_level_ = src.error_level_;
+ main_input_b_ = src.main_input_b_;
}
SCM
return encoding_ ;
}
+
void
My_lily_lexer::add_scope (SCM module)
{
ly_reexport_module (scm_current_module ());
scm_set_current_module (module);
- for (SCM s = scopes_; is_pair (s); s = ly_cdr (s))
+ for (SCM s = scopes_; ly_c_pair_p (s); s = ly_cdr (s))
{
- /* UGH. how to do this more neatly? */
- SCM expr
- = scm_list_3 (ly_symbol2scm ("module-use!"),
- module,
- scm_list_2 (ly_symbol2scm ("module-public-interface"),
- ly_car (s)));
- scm_primitive_eval (expr);
+ ly_use_module (module, ly_car (s));
}
scopes_ = scm_cons (module, scopes_);
}
}
SCM
-My_lily_lexer::lookup_identifier (String s)
+My_lily_lexer::lookup_identifier (String name)
{
- SCM sym = ly_symbol2scm (s.to_str0());
- for (SCM s = scopes_; is_pair (s); s = ly_cdr (s))
+ SCM sym = ly_symbol2scm (name.to_str0 ());
+ for (SCM s = scopes_; ly_c_pair_p (s); s = ly_cdr (s))
{
SCM var = ly_module_lookup (ly_car (s), sym);
if (var != SCM_BOOL_F)
My_lily_lexer::start_main_input ()
{
// yy_flex_debug = 1;
-
- new_input (main_input_name_, &global_input_file->sources_);
+ new_input (main_input_name_, sources_);
/* Do not allow \include in --safe-mode */
allow_includes_b_ = allow_includes_b_ && ! safe_global_b;
void
My_lily_lexer::set_identifier (SCM name, SCM s)
{
- assert (is_string (name));
+ assert (ly_c_string_p (name));
if (lookup_keyword (ly_scm2string (name)) >= 0)
{
progress_indication (_f ("error at EOF: %s", s) + String ("\n"));
else
{
- errorlevel_ |= 1;
+ error_level_ |= 1;
Input spot (get_source_file (), here_str0 ());
spot.error (s);
}
void
My_lily_lexer::set_encoding (String s)
{
- encoding_ = ly_symbol2scm (s.to_str0 ());
+ if (s.length ())
+ encoding_ = ly_symbol2scm (s.to_str0 ());
+ else
+ encoding_ = SCM_EOL;
}