X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmy-lily-lexer.cc;h=49d84d6335efbb3619cc61a937be719042924de3;hb=0cf97b5cdceecbba937f43ac827f4065aad5001e;hp=f80534ed2e0ed2f9759d370c3c407ad757b8ec20;hpb=036af34aa44a151b9e67c18e0acccaafdfae9de8;p=lilypond.git diff --git a/lily/my-lily-lexer.cc b/lily/my-lily-lexer.cc index f80534ed2e..49d84d6335 100644 --- a/lily/my-lily-lexer.cc +++ b/lily/my-lily-lexer.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997 Han-Wen Nienhuys + (c) 1997--1999 Han-Wen Nienhuys */ #include @@ -11,153 +11,234 @@ #include "notename-table.hh" #include "interval.hh" #include "identifier.hh" -#include "assoc-iter.hh" #include "parser.hh" #include "keyword.hh" -#include "assoc.hh" #include "my-lily-lexer.hh" #include "debug.hh" #include "source-file.hh" -#include "parseconstruct.hh" +#include "main.hh" +#include "scope.hh" +#include "input.hh" static Keyword_ent the_key_tab[]={ - {"accepts", ACCEPTS}, - {"alias", ALIAS}, - {"bar", BAR}, - {"cadenza", CADENZA}, - {"clear", CLEAR}, - {"clef", CLEF}, - {"cm", CM_T}, - {"consists", CONSISTS}, - {"contains", CONTAINS}, - {"duration", DURATIONCOMMAND}, - {"absdynamic", ABSDYNAMIC}, - {"group", GROUP}, - {"geometric", GEOMETRIC}, - {"hshift", HSHIFT}, - {"id", ID}, - {"in", IN_T}, - {"init_end", INIT_END}, - {"requestregister", REQUESTREGISTER}, - {"lyric", LYRIC}, - {"key", KEY}, - {"melodic" , MELODIC}, - {"melodic_request", MELODIC_REQUEST}, - {"meter", METER}, - {"midi", MIDI}, - {"mm", MM_T}, - {"multi", MULTI}, - {"note", NOTE}, - {"notenames", NOTENAMES}, - {"octave", OCTAVECOMMAND}, - {"output", OUTPUT}, - {"partial", PARTIAL}, - {"paper", PAPER}, - {"plet", PLET}, - {"pt", PT_T}, - {"score", SCORE}, - {"script", SCRIPT}, - {"skip", SKIP}, - {"staff", STAFF}, - {"start", START_T}, - {"stem", STEM}, - {"table", TABLE}, - {"spandynamic", SPANDYNAMIC}, - {"symboltables", SYMBOLTABLES}, - {"tempo", TEMPO}, - {"texid", TEXID}, - {"textstyle", TEXTSTYLE}, - {"transpose", TRANSPOSE}, - {"unitspace", UNITSPACE}, - {"width", WIDTH}, - {"version", VERSION}, - {"grouping", GROUPING}, - {0,0} + {"autochange", AUTOCHANGE}, + {"spanrequest", SPANREQUEST}, + {"simultaneous", SIMULTANEOUS}, + {"sequential", SEQUENTIAL}, + {"accepts", ACCEPTS}, + {"alternative", ALTERNATIVE}, + {"bar", BAR}, + {"breathe", BREATHE}, + {"cadenza", CADENZA}, + {"chordmodifiers", CHORDMODIFIERS}, + {"chords", CHORDS}, + {"clef", CLEF}, + {"cm", CM_T}, + {"consists", CONSISTS}, + {"consistsend", CONSISTSEND}, + {"context", CONTEXT}, + {"duration", DURATION}, + {"font", FONT}, + {"grace", GRACE}, + {"header", HEADER}, + {"in", IN_T}, + {"lyrics", LYRICS}, + {"key", KEY}, + {"keysignature", KEYSIGNATURE}, + {"mark", MARK}, + {"musicalpitch", MUSICAL_PITCH}, + {"time", TIME_T}, + {"times", TIMES}, + {"midi", MIDI}, + {"mm", MM_T}, + {"name", NAME}, + {"notenames", NOTENAMES}, + {"notes", NOTES}, + {"partial", PARTIAL}, + {"paper", PAPER}, + {"penalty", PENALTY}, + {"property", PROPERTY}, + {"pt", PT_T}, + {"relative", RELATIVE}, + {"remove", REMOVE}, + {"repeat", REPEAT}, + {"repetitions", REPETITIONS}, + {"addlyrics", ADDLYRICS}, + {"scm", SCM_T}, + {"scmfile", SCMFILE}, + {"score", SCORE}, + {"script", SCRIPT}, + {"shape", SHAPE}, + {"skip", SKIP}, + {"textscript", TEXTSCRIPT}, + {"tempo", TEMPO}, + {"translator", TRANSLATOR}, + {"transpose", TRANSPOSE}, + {"type", TYPE}, + {"version", VERSION}, + {0,0} }; My_lily_lexer::My_lily_lexer() { - keytable_p_ = new Keyword_table(the_key_tab); - identifier_assoc_p_ = new Assoc; - errorlevel_i_ = 0; - post_quotes_b_ = false; - note_tab_p_ = new Notename_table; + keytable_p_ = new Keyword_table (the_key_tab); + toplevel_scope_p_ = new Scope; + scope_l_arr_.push (toplevel_scope_p_); + errorlevel_i_ = 0; + note_tab_p_ = new Notename_table; + chordmodifier_tab_p_ = new Notename_table; + main_input_b_ = false; } int -My_lily_lexer::lookup_keyword(String s) +My_lily_lexer::lookup_keyword (String s) { - return keytable_p_->lookup(s); + return keytable_p_->lookup (s.ch_C ()); } Identifier* -My_lily_lexer::lookup_identifier(String s) +My_lily_lexer::lookup_identifier (String s) { - if (!identifier_assoc_p_->elt_b(s)) - return 0; - - return (*identifier_assoc_p_)[s]; + SCM sym = ly_symbol (s.ch_C()); + + for (int i = scope_l_arr_.size (); i--; ) + if (scope_l_arr_[i]->elem_b (sym)) + return scope_l_arr_[i]->elem(sym); + return 0; } +void +My_lily_lexer::start_main_input () +{ + if (flower_dstream && !flower_dstream->silent_b ("InitDeclarations") && flower_dstream) + print_declarations (true); + if (flower_dstream && !flower_dstream->silent_b ("InitLexer") && flower_dstream) + set_debug (1); + + + new_input (main_input_str_, source_global_l); + if (safe_global_b) + allow_includes_b_ = false; + + print_declarations(true); +} void -My_lily_lexer::add_identifier(Identifier*i) +My_lily_lexer::set_identifier (String name_str, Identifier* i, bool ) { - delete lookup_identifier(i->name_str_); - (*identifier_assoc_p_)[i->name_str_] = i; + Identifier *old =0; + if (scope_l_arr_.top ()->elem_b (name_str)) + old = scope_l_arr_.top ()->elem(name_str); + + + if (old) + { +#if 0 + if (unique_b) + old->warning(_f ("redeclaration of `\\%s'", name_str)); +#endif + delete old; + } + if (lookup_keyword (name_str) >= 0) + { + warning ( _f ("Identifier name is a keyword: `%s'", name_str)); + } + + scope_l_arr_.top ()->elem (name_str) = i; } My_lily_lexer::~My_lily_lexer() { - delete keytable_p_; + delete chordmodifier_tab_p_; + delete keytable_p_; + delete toplevel_scope_p_ ; + delete note_tab_p_; +} - for (Assoc_iter - ai(*identifier_assoc_p_); ai.ok(); ai++) { - mtor << "deleting: " << ai.key()<<'\n'; - delete ai.val(); +void +My_lily_lexer::print_declarations (bool ) const +{ + for (int i=scope_l_arr_.size (); i--; ) + { + DEBUG_OUT << "Scope no. " << i << '\n'; + scope_l_arr_[i]->print (); } - delete note_tab_p_; - delete identifier_assoc_p_; } + void -My_lily_lexer::print_declarations(bool init_b)const +My_lily_lexer::LexerError (char const *s) { - for (Assoc_iter ai(*identifier_assoc_p_); ai.ok(); - ai++) { - if (ai.val()->init_b_ == init_b) - ai.val()->print(); + if (include_stack_.empty()) + { + *mlog << _f ("error at EOF: %s", s) << endl; + } + else + { + errorlevel_i_ |= 1; + Input spot (source_file_l(),here_ch_C()); + spot.error (s); } } -void -My_lily_lexer::LexerError(char const *s) +Musical_pitch +My_lily_lexer::lookup_notename (String s) { - if (include_stack_.empty()) { - *mlog << "error at EOF" << s << '\n'; - } else { - errorlevel_i_ |= 1; - - Input spot(source_file_l(),here_ch_C()); + return (*note_tab_p_)[s]; +} - spot.error( s ); - } +Musical_pitch +My_lily_lexer::lookup_chordmodifier (String s) +{ + return (*chordmodifier_tab_p_)[s]; } -Melodic_req* -My_lily_lexer::lookup_melodic_req_l(String s) +bool +My_lily_lexer::notename_b (String s) const { - return note_tab_p_->get_l(s); + return note_tab_p_->elem_b (s); } void -My_lily_lexer::add_notename(String s, Melodic_req *p) +My_lily_lexer::set_notename_table (Notename_table *p) +{ + delete note_tab_p_; + note_tab_p_ = p; +} + +bool +My_lily_lexer::chordmodifier_b (String s) const { - note_tab_p_->add(s,p); + return chordmodifier_tab_p_->elem_b (s); } void -My_lily_lexer::clear_notenames() +My_lily_lexer::set_chordmodifier_table (Notename_table *p) +{ + delete chordmodifier_tab_p_; + chordmodifier_tab_p_ = p; +} + +char +My_lily_lexer::escaped_char(char c) const +{ + switch(c) + { + case 'n': + return '\n'; + case 't': + return '\t'; + + case '\'': + case '\"': + case '\\': + return c; + } + return 0; +} + +Input +My_lily_lexer::here_input () const { - delete note_tab_p_; - note_tab_p_ = new Notename_table; + Source_file * f_l= source_file_l (); + return Input (f_l, (char*)here_ch_C ()); }