X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmy-lily-lexer.cc;h=ab0bd3f3a82b295e16ec8a753acd2b7bbc05e50d;hb=d3c90f63573d53cfb191cc48f8f6ee672a5ca37a;hp=6ff46f282cabfc19e7360bfe133e8df452bf94ae;hpb=1ca7a2c01e48a2585ab7b43aa18c9c276d4a05d0;p=lilypond.git diff --git a/lily/my-lily-lexer.cc b/lily/my-lily-lexer.cc index 6ff46f282c..ab0bd3f3a8 100644 --- a/lily/my-lily-lexer.cc +++ b/lily/my-lily-lexer.cc @@ -1,9 +1,9 @@ /* 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 + (c) 1997--2000 Han-Wen Nienhuys */ #include @@ -11,130 +11,171 @@ #include "interval.hh" #include "identifier.hh" -#include "assoc-iter.hh" -#include "out/parser.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[]={ - "bar", BAR, - "cadenza", CADENZA, - "clef", CLEF, - "cm", CM_T, - "duration", DURATIONCOMMAND, - "absdynamic", ABSDYNAMIC, - "group", GROUP, - "geometric", GEOMETRIC, - "in", IN_T, - "inputregister", INPUT_REGS, - "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, - "spandynamic", SPANDYNAMIC, - "symboltables", SYMBOLTABLES, - "tempo", TEMPO, - "texid", TEXID, - "textstyle", TEXTSTYLE, - "transpose", TRANSPOSE, - "unitspace", UNITSPACE, - "width", WIDTH, - "grouping", GROUPING, - 0,0 + {"autochange", AUTOCHANGE}, + {"spanrequest", SPANREQUEST}, + {"commandspanrequest", COMMANDSPANREQUEST}, + {"simultaneous", SIMULTANEOUS}, + {"sequential", SEQUENTIAL}, + {"accepts", ACCEPTS}, + {"alternative", ALTERNATIVE}, + {"bar", BAR}, + {"breathe", BREATHE}, + {"char", CHAR_T}, + {"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}, + {"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}, + {"skip", SKIP}, + {"textscript", TEXTSCRIPT}, + {"tempo", TEMPO}, + {"translator", TRANSLATOR}, + {"transpose", TRANSPOSE}, + {"type", TYPE}, + {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); + toplevel_scope_p_ = new Scope; + scope_l_arr_.push (toplevel_scope_p_); + errorlevel_i_ = 0; + 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_query(s)) - return 0; - - return (*identifier_assoc_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 () +{ + new_input (main_input_str_, source_global_l); + allow_includes_b_ = allow_includes_b_ && !(safe_global_b); +} void -My_lily_lexer::add_identifier(Identifier*i) +My_lily_lexer::set_identifier (String name_str, Identifier* i, bool ) { - delete lookup_identifier(i->name); - (*identifier_assoc_p_)[i->name] = i; + Identifier *old =0; + if (scope_l_arr_.top ()->elem_b (name_str)) + old = scope_l_arr_.top ()->elem(name_str); + + + if (old) + { + 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_; - - 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_) - i_p->warning("Variable not used"); - - delete ai.val(); - } - delete identifier_assoc_p_; + delete keytable_p_; + delete toplevel_scope_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()) + { + progress_indication (_f ("error at EOF: %s", s)+ String ("\n")); + } + else + { + errorlevel_i_ |= 1; + Input spot (source_file_l(),here_ch_C()); + spot.error (s); } } -void -My_lily_lexer::LexerError(char const *s) +char +My_lily_lexer::escaped_char(char c) const { - if (include_stack_.empty()) { - *mlog << "error at EOF" << s << '\n'; - } else { - errorlevel_i_ |= 1; - error(String(s)); - // FIXME. -/*Input spot(source_l_g = here_spot(); - - spot.error( s ); - */ + switch(c) + { + case 'n': + return '\n'; + case 't': + return '\t'; + + case '\'': + case '\"': + case '\\': + return c; } + return 0; } +Input +My_lily_lexer::here_input () const +{ + Source_file * f_l= source_file_l (); + return Input (f_l, (char*)here_ch_C ()); +}