X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmy-lily-parser.cc;h=4a44f5919a8f814821e23923db12fd8f430bdaa2;hb=54404c570a48ddf9772c5ca64a154d0c0149e61e;hp=a411b3f9a1ab5b1c24cd17ad2aeb309f8c136fd7;hpb=1ecbcc5337a3ea4d347b197c60e9c95ea11ad93e;p=lilypond.git diff --git a/lily/my-lily-parser.cc b/lily/my-lily-parser.cc index a411b3f9a1..4a44f5919a 100644 --- a/lily/my-lily-parser.cc +++ b/lily/my-lily-parser.cc @@ -3,431 +3,129 @@ source file of the GNU LilyPond music typesetter - (c) 1997--1998 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys + Jan Nieuwenhuizen */ #include "my-lily-parser.hh" #include "my-lily-lexer.hh" #include "debug.hh" #include "main.hh" -#include "music-list.hh" -#include "musical-request.hh" -#include "command-request.hh" #include "parser.hh" -#include "scope.hh" #include "file-results.hh" -#include "midi-def.hh" -#include "paper-def.hh" -#include "identifier.hh" +#include "scope.hh" My_lily_parser::My_lily_parser (Sources * source_l) { - first_b_ = true; source_l_ = source_l; lexer_p_ = 0; - abbrev_beam_type_i_ = 0; - default_duration_.durlog_i_ = 2; - default_abbrev_i_ = 0; + default_duration_ = Duration (2,0); error_level_i_ = 0; - extender_req = 0; - fatal_error_i_ = 0; + + default_header_p_ =0; } -My_lily_parser::~My_lily_parser() +My_lily_parser::~My_lily_parser () { delete lexer_p_; delete default_header_p_; } - - void -My_lily_parser::set_version_check (bool ig) +My_lily_parser::set_version_check (bool) { - ignore_version_b_ = ig; } void My_lily_parser::parse_file (String init, String s) { lexer_p_ = new My_lily_lexer; - init_str_ = init; + lexer_p_->main_input_str_ = s; - *mlog << _ ("Parsing..."); + progress_indication (_ ("Parsing...")); - init_parse_b_ = false; - set_yydebug (!monitor->silent_b ("Parser") && check_debug); + set_yydebug (0); lexer_p_->new_input (init, source_l_); do_yyparse (); - if (!define_spot_array_.empty()) + progress_indication ("\n"); + + if (!define_spot_array_.empty ()) { - warning (_ ("braces don't match")); + define_spot_array_.top ().warning (_ ("Braces don't match")); error_level_i_ = 1; } inclusion_global_array = lexer_p_->filename_str_arr_; + + error_level_i_ = error_level_i_ | lexer_p_->errorlevel_i_; // ugh naming. } void -My_lily_parser::remember_spot() +My_lily_parser::push_spot () { - define_spot_array_.push (here_input()); + define_spot_array_.push (here_input ()); } char const * -My_lily_parser::here_ch_C() const +My_lily_parser::here_ch_C () const { - return lexer_p_->here_ch_C(); + return lexer_p_->here_ch_C (); } void My_lily_parser::parser_error (String s) { - here_input().error (s); - if (fatal_error_i_) - exit (fatal_error_i_); + here_input ().error (s); error_level_i_ = 1; - exit_status_i_ = 1; + exit_status_global = 1; } -void -My_lily_parser::set_abbrev_beam (int type_i) -{ - abbrev_beam_type_i_ = type_i; -} - - void My_lily_parser::set_last_duration (Duration const *d) { default_duration_ = *d; - - /* - forget plet part, - but keep sticky plet factor within plet brackets - */ - default_duration_.plet_ = plet_; } -Simultaneous_music* -My_lily_parser::get_word_element (String s, Duration * duration_p) +Input +My_lily_parser::pop_spot () { - Simultaneous_music* velt_p = new Request_chord; - - Lyric_req* lreq_p = new Lyric_req; - lreq_p ->text_str_ = s; - lreq_p->duration_ = *duration_p; - lreq_p->set_spot (here_input()); - - velt_p->add_music (lreq_p); - - delete duration_p; - return velt_p; + return define_spot_array_.pop (); } - -Simultaneous_music * -My_lily_parser::get_rest_element (String s, Duration * duration_p) +Input +My_lily_parser::here_input () const { - Simultaneous_music* velt_p = new Request_chord; - velt_p->set_spot (here_input()); - - if (s=="s") - { /* Space */ - Skip_req * skip_p = new Skip_req; - skip_p->duration_ = *duration_p; - - skip_p->set_spot (here_input()); - velt_p->add_music (skip_p); - } - else - { - Rest_req * rest_req_p = new Rest_req; - rest_req_p->duration_ = *duration_p; - rest_req_p->set_spot (here_input()); - - velt_p->add_music (rest_req_p); - } - - delete duration_p; - return velt_p; + return lexer_p_->here_input (); } -Simultaneous_music * -My_lily_parser::get_chord (Musical_pitch tonic, Array* add_arr_p, Array* sub_arr_p, Duration d) -{ - Simultaneous_music*v = new Request_chord; - v->set_spot (here_input ()); - - Note_req* n = new Note_req; - n->pitch_ = tonic; - n->duration_ = d; - v->add_music (n); - - for (int i = 0; i < add_arr_p->size (); i++) - { - Musical_pitch p = tonic; - p.transpose ((*add_arr_p)[i]); - (*add_arr_p)[i] = p; - } - add_arr_p->sort (Musical_pitch::compare); - for (int i = 0; i < sub_arr_p->size (); i++) - { - Musical_pitch p = tonic; - p.transpose ((*sub_arr_p)[i]); - (*sub_arr_p)[i] = p; - } - sub_arr_p->sort (Musical_pitch::compare); - - Musical_pitch third; - third.notename_i_ = 2; - - Musical_pitch mthird; - mthird.notename_i_ = 2; - mthird.accidental_i_ = -1; - - Musical_pitch missing; - missing = tonic; - missing.transpose (third); - - Musical_pitch p; - p = tonic; - p.transpose (third); - p.transpose (mthird); - - /* - must have minimum at 5 (3 is added automatically as missing) - */ - if (!add_arr_p->size () - || ((add_arr_p->size () == 1) && - ((add_arr_p->top ().notename_i_ != p.notename_i_) - || (add_arr_p->top () < p)))) - add_arr_p->push (p); - - Array triads; - triads.push (third); // c e - triads.push (mthird); // d f - triads.push (mthird); // e g - triads.push (third); // f a - triads.push (third); // g b - triads.push (mthird); // a c - triads.push (mthird); // b d - - /* - add missing triads - */ - for (int i = 0; i < add_arr_p->size (); i++) - { - Musical_pitch p = (*add_arr_p)[i]; - if ((p > missing) && (p.notename_i_ != missing.notename_i_)) - while ((p > missing) && (p.notename_i_ != missing.notename_i_)) - { - add_arr_p->insert (missing, i++); - missing.transpose (triads[(missing.notename_i_ - tonic.notename_i_ + 8) % 8]); - } - else - i++; - } - - /* - add all that aren't subtracted - */ - for (int i = 0; i < add_arr_p->size (); i++) - { - Musical_pitch p = (*add_arr_p)[i]; - Note_req* n = new Note_req; - n->pitch_ = p; - n->duration_ = d; - for (int j = 0; j < sub_arr_p->size (); j++) - { - if (p == (*sub_arr_p)[j]) - { - delete n; - n = 0; - break; - } - } - if (n) - v->add_music (n); - } - - v->set_spot (here_input ()); - return v; -} - -Simultaneous_music * -My_lily_parser::get_note_element (Note_req *rq, Duration * duration_p) -{ - Simultaneous_music*v = new Request_chord; - v->set_spot (here_input ()); - - v->add_music (rq); +// move me? +#include "paper-def.hh" +#include "translator-def.hh" - // too bad parser reads (default) duration via member access, - // this hack will do for now.. - if (abbrev_beam_type_i_) - { - assert (!duration_p->plet_b ()); - duration_p->set_plet (1, 2); - } - rq->duration_ = *duration_p; - rq->set_spot (here_input ()); - delete duration_p ; - return v; -} +My_lily_parser * current_parser; +MAKE_SCHEME_CALLBACK (My_lily_parser,paper_description, 0); -/* - UGH. - */ -Array* -My_lily_parser::get_parens_request (int t) +SCM +My_lily_parser::paper_description () { - Array& reqs = *new Array; - switch (t) - { - case '~': - reqs.push (new Tie_req); - break; - case BEAMPLET: - case MAEBTELP: - { - Plet_req* p = new Plet_req; - p->plet_i_ = plet_.type_i_; - reqs.push (p); - } - /* fall through */ - case '[': - case ']': - { - if (!abbrev_beam_type_i_) - { - reqs.push (new Beam_req); - } - else - { - Abbreviation_beam_req* a = new Abbreviation_beam_req; - a->type_i_ = abbrev_beam_type_i_; - if (t==']') - abbrev_beam_type_i_ = 0; - reqs.push (a); - } - } - break; + My_lily_parser * me = current_parser; - case '>': - case '!': - case '<': - reqs.push (new Span_dynamic_req); - break; + Music_output_def *id = unsmob_music_output_def (me->lexer_p_->lookup_identifier ("$defaultpaper")); + Paper_def *p = dynamic_cast (id->clone ()); - case PLET: - case TELP: - { - Plet_req* p = new Plet_req; - p->plet_i_ = plet_.type_i_; - reqs.push (p); - } - break; - case ')': - case '(': - { - reqs.push (new Slur_req); - } - break; - default: - assert (false); - break; - } - - switch (t) - { - case BEAMPLET: - dynamic_cast (reqs.top ())->spantype = Span_req::START; - /* fall through */ - case '<': - case '>': - case '(': - case '[': - case PLET: - dynamic_cast (reqs.top ())->spantype = Span_req::START; - break; - case MAEBTELP: - dynamic_cast (reqs.top ())->spantype = Span_req::STOP; - /* fall through */ - case '!': - case ')': - case ']': - dynamic_cast (reqs[0])->spantype = Span_req::STOP; - break; - - default: - break; - } - - for (int i = 0; i < reqs.size (); i++) - if (dynamic_cast (reqs[i])) - { - Span_dynamic_req* s_l= dynamic_cast (reqs[i]); - s_l->dynamic_dir_ = (t == '<') ? UP:DOWN; - } - - // ugh? don't we do this in the parser too? - reqs[0]->set_spot (here_input()); - return &reqs; -} - -void -My_lily_parser::add_requests (Simultaneous_music*v) -{ - for (int i = 0; i < pre_reqs.size(); i++) + SCM al = p->translator_p_dict_p_->to_alist (); + SCM l = SCM_EOL; + for (SCM s = al ; gh_pair_p (s); s = gh_cdr (s)) { - v->add_music (pre_reqs[i]); + Translator_def * td = unsmob_translator_def (gh_cdar (s)); + l = gh_cons (gh_cons (gh_caar (s), td->to_alist ()), l); } - pre_reqs.clear(); - for (int i = 0; i add_music (post_reqs[i]); - } - - post_reqs.clear(); -} - -Input -My_lily_parser::pop_spot() -{ - return define_spot_array_.pop(); -} - -Input -My_lily_parser::here_input() const -{ - Source_file * f_l= lexer_p_->source_file_l(); - return Input (f_l, here_ch_C()); -} - -void -My_lily_parser::add_notename (String s, Musical_pitch p) -{ - lexer_p_->add_notename (s, p); - -} - -Paper_def* -My_lily_parser::default_paper_p () -{ - Identifier *id = lexer_p_->lookup_identifier ("$defaultpaper"); - return id ? id->access_content_Paper_def (true) : new Paper_def ; -} - -Midi_def* -My_lily_parser::default_midi_p () -{ - Identifier *id = lexer_p_->lookup_identifier ("$defaultmidi"); - return id ? id->access_content_Midi_def (true) : new Midi_def ; + return l; } +