X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmy-lily-lexer.cc;h=43495eb06cf6a01b960febcc02baa7b151bd5ef0;hb=5cfb4ad642561dcb61593b1aeb24717c5eb110da;hp=57909e87086413edc856c826600e7ab32b0f5e8c;hpb=a41a7fb966e8552cc8da7c4eab1b60eb7b8eff3a;p=lilypond.git diff --git a/lily/my-lily-lexer.cc b/lily/my-lily-lexer.cc index 57909e8708..43495eb06c 100644 --- a/lily/my-lily-lexer.cc +++ b/lily/my-lily-lexer.cc @@ -1,18 +1,18 @@ /* my-lily-lexer.cc -- implement My_lily_lexer - source file of the LilyPond music typesetter + source file of the GNU LilyPond music typesetter (c) 1997 Han-Wen Nienhuys */ #include #include - +#include "notename-table.hh" #include "interval.hh" #include "identifier.hh" #include "assoc-iter.hh" -#include "out/parser.hh" +#include "parser.hh" #include "keyword.hh" #include "assoc.hh" #include "my-lily-lexer.hh" @@ -21,119 +21,165 @@ #include "parseconstruct.hh" static Keyword_ent the_key_tab[]={ - "bar", BAR, - "cadenza", CADENZA, - "clef", CLEF, - "cm", CM_T, - "duration", DURATIONCOMMAND, - "dynamic", DYNAMIC, - "geometric", GEOMETRIC, - "in", IN_T, - "lyric", LYRIC, - "key", KEY, - "melodic" , MELODIC, - "melodic_request", MELODIC_REQUEST, - "meter", METER, - "midi", MIDI, - "mm", MM_T, - "multivoice", MULTIVOICE, - "note", NOTE, - "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, - "symboltables", SYMBOLTABLES, - "tempo", TEMPO, - "texid", TEXID, - "textstyle", TEXTSTYLE, - "transpose", TRANSPOSE, - "unitspace", UNITSPACE, - "width", WIDTH, - "grouping", GROUPING, - 0,0 + {"accepts", ACCEPTS}, + {"bar", BAR}, + {"break", BREAK}, + {"cadenza", CADENZA}, + {"clear", CLEAR}, + {"clef", CLEF}, + {"cm", CM_T}, + {"consists", CONSISTS}, + {"contains", CONTAINS}, + {"duration", DURATION}, + {"absdynamic", ABSDYNAMIC}, + {"in", IN_T}, + {"translator", TRANSLATOR}, + {"type", TYPE}, + {"lyric", LYRIC}, + {"key", KEY}, + {"melodic" , MELODIC}, + {"melodic_request", MELODIC_REQUEST}, + {"meter", METER}, + {"midi", MIDI}, + {"mm", MM_T}, + {"multi", MULTI}, + {"header", HEADER}, + {"notenames", NOTENAMES}, + {"octave", OCTAVE}, + {"output", OUTPUT}, + {"partial", PARTIAL}, + {"paper", PAPER}, + {"property", PROPERTY}, + {"pt", PT_T}, + {"score", SCORE}, + {"script", SCRIPT}, + {"shape", SHAPE}, + {"skip", SKIP}, + {"staff", STAFF}, + {"table", TABLE}, + {"spandynamic", SPANDYNAMIC}, + {"symboltables", SYMBOLTABLES}, + {"tempo", TEMPO}, + {"texid", TEXID}, + {"textstyle", TEXTSTYLE}, + {"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; - errorlevel_i_ = 0; - post_quotes_b_ = false; - + keytable_p_ = new Keyword_table (the_key_tab); + identifier_p_dict_p_ = new Dictionary; + errorlevel_i_ = 0; + post_quotes_b_ = false; + note_tab_p_ = new Notename_table; } 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_query(s)) - return 0; - - return (*identifier_assoc_p_)[s]; + if (!identifier_p_dict_p_->elt_b (s)) + return 0; + + return (*identifier_p_dict_p_)[s]; } void -My_lily_lexer::add_identifier(Identifier*i) +My_lily_lexer::set_identifier (String name_str, Identifier*i) { - delete lookup_identifier(i->name); - (*identifier_assoc_p_)[i->name] = i; + Identifier *old = lookup_identifier (name_str); + if (old) + { + old->warning(_("redeclaration of \\") + name_str); + delete old; + } + (*identifier_p_dict_p_)[name_str] = i; } My_lily_lexer::~My_lily_lexer() { - delete keytable_p_; - - for (Assoc_iter - ai(*identifier_assoc_p_); ai.ok(); ai++) { - mtor << "deleting: " << ai.key()<<'\n'; - Identifier *i_p = ai.val(); - if (!i_p->accessed_b_ && !i_p->init_b_) - warning("Variable not used", i_p->defined_ch_C_); - - delete ai.val(); + delete keytable_p_; + + for (Assoc_iter + ai (*identifier_p_dict_p_); ai.ok(); ai++) + { + DOUT << "deleting: " << ai.key()<<'\n'; + delete ai.val(); } - delete identifier_assoc_p_; + delete note_tab_p_; + delete identifier_p_dict_p_; } void -My_lily_lexer::print_declarations(bool init_b)const +My_lily_lexer::print_declarations (bool init_b) const { - for (Assoc_iter ai(*identifier_assoc_p_); ai.ok(); - ai++) { - if (ai.val()->init_b_ == init_b) - ai.val()->print(); + for (Assoc_iter ai (*identifier_p_dict_p_); + ai.ok(); ai++) + { + if (ai.val()->init_b_ == init_b) + { + DOUT << ai.key() << '='; + ai.val()->print (); + } } } void -My_lily_lexer::LexerError(char const *s) +My_lily_lexer::LexerError (char const *s) { - if (include_stack_.empty()) { - *mlog << "error at EOF" << s << '\n'; - } else { - char const* ch_C = here_ch_C(); - if ( ch_C ) { - ch_C--; - while (isspace(*ch_C == ' ' )) - ch_C--; - ch_C++; - } - errorlevel_i_ |= 1; - error( s, ch_C ); + if (include_stack_.empty()) + { + *mlog << _("error at EOF") << s << '\n'; } + else + { + 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) +{ + return note_tab_p_->get_l (s); +} + +void +My_lily_lexer::add_notename (String s, Melodic_req *p) +{ + note_tab_p_->add (s,p); } +void +My_lily_lexer::clear_notenames() +{ + delete note_tab_p_; + note_tab_p_ = new Notename_table; +} + +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; +}