X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmy-lily-lexer.cc;h=309602f469d1320723852103a032c82647aae85d;hb=4c98b01aebe68dfd73d4954ad67143d4a85a250b;hp=857d364ede06983728cef17f530f3e72070876db;hpb=13e79c0250d34b6bdfbafbc551ef64e8b59b2991;p=lilypond.git diff --git a/lily/my-lily-lexer.cc b/lily/my-lily-lexer.cc index 857d364ede..309602f469 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,161 +11,218 @@ #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" static Keyword_ent the_key_tab[]={ + {"absdynamic", ABSDYNAMIC}, {"accepts", ACCEPTS}, - {"alias", ALIAS}, + {"alternative", ALTERNATIVE}, {"bar", BAR}, {"cadenza", CADENZA}, - {"clear", CLEAR}, + {"chordmodifiers", CHORDMODIFIERS}, + {"chords", CHORDS}, {"clef", CLEF}, {"cm", CM_T}, {"consists", CONSISTS}, - {"contains", CONTAINS}, {"duration", DURATION}, - {"absdynamic", ABSDYNAMIC}, - {"group", GROUP}, - {"hshift", HSHIFT}, - {"id", ID}, + {"font", FONT}, + {"grouping", GROUPING}, + {"header", HEADER}, {"in", IN_T}, - {"requesttranslator", REQUESTTRANSLATOR}, - {"lyric", LYRIC}, + {"lyrics", LYRICS}, {"key", KEY}, - {"melodic" , MELODIC}, - {"melodic_request", MELODIC_REQUEST}, - {"meter", METER}, + {"keysignature", KEYSIGNATURE}, + {"mark", MARK}, + {"musicalpitch", MUSICAL_PITCH}, + {"time", TIME_T}, + {"times", TIMES}, {"midi", MIDI}, {"mm", MM_T}, - {"multi", MULTI}, - {"header", HEADER}, + {"name", NAME}, {"notenames", NOTENAMES}, - {"octave", OCTAVE}, - {"output", OUTPUT}, + {"notes" , NOTES}, {"partial", PARTIAL}, {"paper", PAPER}, - {"plet", PLET}, + {"penalty", PENALTY}, + {"property", PROPERTY}, {"pt", PT_T}, + {"relative", RELATIVE}, + {"remove", REMOVE}, + {"repeat", REPEAT}, + {"scm", SCM_T}, + {"scmfile", SCMFILE}, {"score", SCORE}, {"script", SCRIPT}, + {"shape", SHAPE}, {"skip", SKIP}, - {"staff", STAFF}, - {"stem", STEM}, - {"table", TABLE}, - {"spandynamic", SPANDYNAMIC}, - {"symboltables", SYMBOLTABLES}, + {"spandynamic", SPANDYNAMIC}, {"tempo", TEMPO}, - {"texid", TEXID}, - {"textstyle", TEXTSTYLE}, + {"translator", TRANSLATOR}, + {"type", TYPE}, {"transpose", TRANSPOSE}, {"version", VERSION}, - {"grouping", GROUPING}, {0,0} }; My_lily_lexer::My_lily_lexer() { keytable_p_ = new Keyword_table (the_key_tab); - identifier_assoc_p_ = new Assoc; + toplevel_scope_p_ = new Scope; + scope_l_arr_.push (toplevel_scope_p_); errorlevel_i_ = 0; - post_quotes_b_ = false; note_tab_p_ = new Notename_table; + chordmodifier_tab_p_ = new Notename_table; + main_input_b_ = false; } int 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) { - if (!identifier_assoc_p_->elt_b (s)) - return 0; + SCM sym = ly_symbol (s.ch_C()); - return (*identifier_assoc_p_)[s]; + 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 (!monitor->silent_b ("InitDeclarations") && check_debug) + print_declarations (true); + if (!monitor->silent_b ("InitLexer") && check_debug) + 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::set_identifier (String name_str, Identifier*i) +My_lily_lexer::set_identifier (String name_str, Identifier* i, bool ) { - Identifier *old = lookup_identifier (name_str); - if (old) + Identifier *old =0; + if (scope_l_arr_.top ()->elem_b (name_str)) + old = scope_l_arr_.top ()->elem(name_str); + + + if (old) { - old->warning( "redeclaration of \\" + name_str); - delete old; +#if 0 + if (unique_b) + old->warning(_f ("redeclaration of `\\%s\'", name_str)); +#endif + delete old; } - (*identifier_assoc_p_)[name_str] = i; + 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_; - - for (Assoc_iter - ai (*identifier_assoc_p_); ai.ok(); ai++) - { - DOUT << "deleting: " << ai.key()<<'\n'; - delete ai.val(); - } + delete toplevel_scope_p_ ; delete note_tab_p_; - delete identifier_assoc_p_; } + void -My_lily_lexer::print_declarations (bool init_b)const +My_lily_lexer::print_declarations (bool ) const { - for (Assoc_iter ai (*identifier_assoc_p_); ai.ok(); - ai++) - { - if (ai.val()->init_b_ == init_b) - { - DOUT << ai.key() << '='; - ai.val()->print (); - } + for (int i=scope_l_arr_.size (); i--; ) + { + DOUT << "Scope no. " << i << '\n'; + scope_l_arr_[i]->print (); } } void My_lily_lexer::LexerError (char const *s) { - if (include_stack_.empty()) + if (include_stack_.empty()) { - *mlog << "error at EOF" << s << '\n'; + *mlog << _f ("error at EOF: %s", s) << endl; } - else + else { - errorlevel_i_ |= 1; - - Input spot (source_file_l(),here_ch_C()); - - spot.error (s); + errorlevel_i_ |= 1; + Input spot (source_file_l(),here_ch_C()); + spot.error (s); } } -Melodic_req* -My_lily_lexer::lookup_melodic_req_l (String s) +Musical_pitch +My_lily_lexer::lookup_notename (String s) { - return note_tab_p_->get_l (s); + return (*note_tab_p_)[s]; } -void -My_lily_lexer::add_notename (String s, Melodic_req *p) +Musical_pitch +My_lily_lexer::lookup_chordmodifier (String s) +{ + return (*chordmodifier_tab_p_)[s]; +} + +bool +My_lily_lexer::notename_b (String s) const { - note_tab_p_->add (s,p); + return note_tab_p_->elem_b (s); } void -My_lily_lexer::clear_notenames() +My_lily_lexer::set_notename_table (Notename_table *p) { delete note_tab_p_; - note_tab_p_ = new Notename_table; + note_tab_p_ = p; +} + +bool +My_lily_lexer::chordmodifier_b (String s) const +{ + return chordmodifier_tab_p_->elem_b (s); +} + +void +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; }