source file of the GNU LilyPond music typesetter
- (c) 1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include <ctype.h>
static Keyword_ent the_key_tab[]={
+ {"acciaccatura", ACCIACCATURA},
+ {"accepts", ACCEPTS},
+ {"addlyrics", ADDLYRICS},
{"alias", ALIAS},
+ {"alternative", ALTERNATIVE},
{"apply", APPLY},
{"applycontext", APPLYCONTEXT},
{"applyoutput", APPLYOUTPUT},
+ {"appoggiatura", APPOGGIATURA},
{"autochange", AUTOCHANGE},
- {"simultaneous", SIMULTANEOUS},
- {"sequential", SEQUENTIAL},
- {"accepts", ACCEPTS},
- {"alternative", ALTERNATIVE},
{"bar", BAR},
{"breathe", BREATHE},
- {"chordmodifiers", CHORDMODIFIERS},
+ {"change", CHANGE},
{"chords", CHORDS},
{"clef", CLEF},
{"consists", CONSISTS},
{"context", CONTEXT},
{"default", DEFAULT},
{"denies", DENIES},
+ {"drums", DRUMS},
{"description", DESCRIPTION},
- {"duration", DURATION},
- {"grobdescriptions", GROBDESCRIPTIONS},
{"figures",FIGURES},
{"grace", GRACE},
+ {"grobdescriptions", GROBDESCRIPTIONS},
{"header", HEADER},
- {"lyrics", LYRICS},
{"key", KEY},
+ {"lyrics", LYRICS},
+ {"lyricsto", NEWADDLYRICS},
{"mark", MARK},
{"markup", MARKUP},
- {"once", ONCE},
- {"pitch", PITCH},
- {"time", TIME_T},
- {"times", TIMES},
{"midi", MIDI},
{"name", NAME},
- {"pitchnames", PITCHNAMES},
+ {"new", NEWCONTEXT},
{"notes", NOTES},
- {"outputproperty", OUTPUTPROPERTY},
+ {"octave", OCTAVE},
+ {"once", ONCE},
{"override", OVERRIDE},
- {"set", SET},
- {"rest", REST},
- {"revert", REVERT},
- {"partial", PARTIAL},
{"paper", PAPER},
- {"property", PROPERTY},
+ {"partcombine", PARTCOMBINE},
+ {"partial", PARTIAL},
{"relative", RELATIVE},
{"remove", REMOVE},
{"repeat", REPEAT},
- {"addlyrics", ADDLYRICS},
- {"partcombine", PARTCOMBINE},
+ {"rest", REST},
+ {"revert", REVERT},
{"score", SCORE},
+ {"sequential", SEQUENTIAL},
+ {"set", SET},
+ {"simultaneous", SIMULTANEOUS},
{"skip", SKIP},
+ {"tag", TAG},
{"tempo", TEMPO},
+ {"time", TIME_T},
+ {"times", TIMES},
{"translator", TRANSLATOR},
{"transpose", TRANSPOSE},
{"type", TYPE},
{"unset", UNSET},
+ {"with", WITH},
{0,0}
};
My_lily_lexer::My_lily_lexer ()
{
+ // yy_flex_debug = 1;
+
keytable_ = new Keyword_table (the_key_tab);
+
+ chordmodifier_tab_ = scm_make_vector (gh_int2scm (1), SCM_EOL);
+ pitchname_tab_stack_ = SCM_EOL;
+
scopes_ = SCM_EOL;
add_scope(ly_make_anonymous_module());
void
My_lily_lexer::add_scope (SCM module)
{
- ly_reexport_module (scm_current_module());
+ ly_reexport_module (scm_current_module ());
scm_set_current_module (module);
for (SCM s = scopes_; gh_pair_p (s); s = gh_cdr (s))
{
void
My_lily_lexer::start_main_input ()
{
- new_input (main_input_string_, &global_input_file->sources_);
- allow_includes_b_ = allow_includes_b_ && ! (safe_global_b);
+ new_input (main_input_name_, &global_input_file->sources_);
+ allow_includes_b_ = allow_includes_b_ && ! safe_global_b;
+
+ scm_module_define (gh_car (scopes_),
+ ly_symbol2scm ("input-file-name"),
+ scm_makfrom0str (main_input_name_.to_str0 ()));
}
void
void
My_lily_lexer::LexerError (char const *s)
{
- if (include_stack_.empty ())
+ if (include_stack_.is_empty ())
{
progress_indication (_f ("error at EOF: %s", s)+ String ("\n"));
}
{
last_input_ = here_input();
}
-
-#if 0
-SCM
-My_lily_lexer::scan_markup_word (String s)
-{
- /*
- TODO: better implementation:
-
- - make a table of markup functions, for quicker lookup
-
- - error handling.
-
- */
- SCM s = scm_c_eval_str ((s + "-markup").to_str0());
- yylval.scm = s;
- return MARKUP_HEAD;
-}
-#endif