X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmy-lily-lexer.cc;h=ab0bd3f3a82b295e16ec8a753acd2b7bbc05e50d;hb=d3c90f63573d53cfb191cc48f8f6ee672a5ca37a;hp=77f13bf18e56bc3a26dbeb71c6c939097d699f2f;hpb=69b9cead5afe7164b9053d26eba582fec3825ef8;p=lilypond.git diff --git a/lily/my-lily-lexer.cc b/lily/my-lily-lexer.cc index 77f13bf18e..ab0bd3f3a8 100644 --- a/lily/my-lily-lexer.cc +++ b/lily/my-lily-lexer.cc @@ -3,79 +3,89 @@ source file of the GNU LilyPond music typesetter - (c) 1997--1998 Han-Wen Nienhuys + (c) 1997--2000 Han-Wen Nienhuys */ #include #include -#include "notename-table.hh" + #include "interval.hh" #include "identifier.hh" -#include "assoc-iter.hh" +#include "lily-guile.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" +#include "moment.hh" static Keyword_ent the_key_tab[]={ + {"autochange", AUTOCHANGE}, + {"spanrequest", SPANREQUEST}, + {"commandspanrequest", COMMANDSPANREQUEST}, + {"simultaneous", SIMULTANEOUS}, + {"sequential", SEQUENTIAL}, {"accepts", ACCEPTS}, + {"alternative", ALTERNATIVE}, {"bar", BAR}, - {"break", BREAK}, - {"cadenza", CADENZA}, - {"clear", CLEAR}, + {"breathe", BREATHE}, + {"char", CHAR_T}, + {"chordmodifiers", CHORDMODIFIERS}, + {"chords", CHORDS}, {"clef", CLEF}, {"cm", CM_T}, {"consists", CONSISTS}, - {"contains", CONTAINS}, + {"consistsend", CONSISTSEND}, + {"context", CONTEXT}, {"duration", DURATION}, - {"absdynamic", ABSDYNAMIC}, + {"font", FONT}, + {"grace", GRACE}, + {"header", HEADER}, {"in", IN_T}, - {"translator", TRANSLATOR}, - {"type", TYPE}, - {"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}, + {"outputproperty", OUTPUTPROPERTY}, {"partial", PARTIAL}, {"paper", PAPER}, + {"penalty", PENALTY}, {"property", PROPERTY}, {"pt", PT_T}, + {"relative", RELATIVE}, + {"remove", REMOVE}, + {"repeat", REPEAT}, + {"repetitions", REPETITIONS}, + {"addlyrics", ADDLYRICS}, {"score", SCORE}, {"script", SCRIPT}, - {"shape", SHAPE}, {"skip", SKIP}, - {"staff", STAFF}, - {"table", TABLE}, - {"spandynamic", SPANDYNAMIC}, - {"symboltables", SYMBOLTABLES}, + {"textscript", TEXTSCRIPT}, {"tempo", TEMPO}, - {"texid", TEXID}, - {"textstyle", TEXTSTYLE}, + {"translator", TRANSLATOR}, {"transpose", TRANSPOSE}, - {"version", VERSION}, - {"grouping", GROUPING}, + {"type", TYPE}, {0,0} }; My_lily_lexer::My_lily_lexer() { keytable_p_ = new Keyword_table (the_key_tab); - identifier_p_dict_p_ = new Dictionary; + 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; + main_input_b_ = false; } int @@ -87,70 +97,55 @@ My_lily_lexer::lookup_keyword (String s) Identifier* My_lily_lexer::lookup_identifier (String s) { - if (!identifier_p_dict_p_->elt_b (s)) - return 0; - - return (*identifier_p_dict_p_)[s]; + SCM sym = ly_symbol2scm (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 (!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); - - print_declarations(true); + allow_includes_b_ = allow_includes_b_ && !(safe_global_b); } 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); + 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; } - (*identifier_p_dict_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_p_dict_p_); ai.ok(); ai++) - { - DOUT << "deleting: " << ai.key()<<'\n'; - delete ai.val(); - } - delete note_tab_p_; - delete identifier_p_dict_p_; -} -void -My_lily_lexer::print_declarations (bool init_b) const -{ - for (Assoc_iter ai (*identifier_p_dict_p_); - ai.ok(); ai++) - { - if (ai.val()->init_b_ == init_b) - { - DOUT << ai.key() << '='; - ai.val()->print (); - } - } + delete toplevel_scope_p_ ; } + + void My_lily_lexer::LexerError (char const *s) { if (include_stack_.empty()) { - *mlog << _("error at EOF") << s << '\n'; + progress_indication (_f ("error at EOF: %s", s)+ String ("\n")); } else { @@ -160,25 +155,6 @@ My_lily_lexer::LexerError (char const *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 { @@ -196,3 +172,10 @@ My_lily_lexer::escaped_char(char c) const } return 0; } + +Input +My_lily_lexer::here_input () const +{ + Source_file * f_l= source_file_l (); + return Input (f_l, (char*)here_ch_C ()); +}