X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmy-lily-parser.cc;h=f000e678be1d5e317964775e870f37f6c812a2e3;hb=b1a521c92717244d4bff11bb0b2b1304e4355956;hp=7d43cdd8d870acf176b0fa997c4c657256b7d47a;hpb=ee0dca4cea06f2d354cb33d935033116e88a3dba;p=lilypond.git diff --git a/lily/my-lily-parser.cc b/lily/my-lily-parser.cc index 7d43cdd8d8..f000e678be 100644 --- a/lily/my-lily-parser.cc +++ b/lily/my-lily-parser.cc @@ -3,417 +3,142 @@ source file of the GNU LilyPond music typesetter - (c) 1997--1998 Han-Wen Nienhuys + (c) 1997--2004 Han-Wen Nienhuys Jan Nieuwenhuizen */ #include "my-lily-parser.hh" #include "my-lily-lexer.hh" -#include "debug.hh" +#include "warn.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 "input-file-results.hh" +#include "scm-hash.hh" -My_lily_parser::My_lily_parser (Sources * source_l) +My_lily_parser::My_lily_parser (Input_file_results * source) { - first_b_ = true; - source_l_ = source_l; - lexer_p_ = 0; - abbrev_beam_type_i_ = 0; - default_duration_.durlog_i_ = 2; - default_abbrev_i_ = 0; - error_level_i_ = 0; - extender_req = 0; - fatal_error_i_ = 0; - default_header_p_ =0; -} + input_file_ = source; + lexer_ = 0; + default_duration_ = Duration (2,0); + error_level_ = 0; + last_beam_start_ = SCM_EOL; -My_lily_parser::~My_lily_parser() -{ - delete lexer_p_; - delete default_header_p_; + default_header_ =0; } - - -void -My_lily_parser::set_version_check (bool ig) +My_lily_parser::~My_lily_parser () { - ignore_version_b_ = ig; + delete lexer_; + if (default_header_) + scm_gc_unprotect_object (default_header_->self_scm ()); } +/* Process one .ly file, or book. */ void -My_lily_parser::parse_file (String init, String s) +My_lily_parser::parse_file (String init, String in_file, String out_file) { - lexer_p_ = new My_lily_lexer; - init_str_ = init; - lexer_p_->main_input_str_ = s; + lexer_ = new My_lily_lexer; + output_basename_ = out_file; + + lexer_->main_input_name_ = in_file; - *mlog << _ ("Parsing..."); + progress_indication (_ ("Parsing...")); - init_parse_b_ = false; - set_yydebug (!monitor->silent_b ("Parser") && check_debug); - lexer_p_->new_input (init, source_l_); + set_yydebug (0); + lexer_->new_input (init, &input_file_->sources_); + + /* Read .ly IN_FILE, lex, parse, write \score blocks from IN_FILE to + OUT_FILE (unless IN_FILE redefines output file name). */ do_yyparse (); - if (!define_spot_array_.empty()) + progress_indication ("\n"); + + if (!define_spots_.is_empty ()) { - warning (_ ("braces don't match")); - error_level_i_ = 1; + define_spots_.top ().warning (_ ("Braces don't match")); + error_level_ = 1; } - inclusion_global_array = lexer_p_->filename_str_arr_; + input_file_->inclusion_names_ = lexer_->filename_strings_; + + error_level_ = error_level_ | lexer_->errorlevel_; // ugh naming. } void -My_lily_parser::remember_spot() +My_lily_parser::push_spot () { - define_spot_array_.push (here_input()); + define_spots_.push (here_input ()); } char const * -My_lily_parser::here_ch_C() const +My_lily_parser::here_str0 () const { - return lexer_p_->here_ch_C(); + return lexer_->here_str0 (); } void My_lily_parser::parser_error (String s) { - here_input().error (s); - if (fatal_error_i_) - exit (fatal_error_i_); - error_level_i_ = 1; - exit_status_i_ = 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; + here_input ().error (s); + error_level_ = 1; + exit_status_global = 1; } -Simultaneous_music* -My_lily_parser::get_word_element (String s, Duration * duration_p) -{ - 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; -} - -Simultaneous_music * -My_lily_parser::get_rest_element (String s, Duration * duration_p) +Input +My_lily_parser::pop_spot () { - 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 define_spots_.pop (); } -Simultaneous_music * -My_lily_parser::get_chord (Musical_pitch tonic, Array* add_arr_p, Array* sub_arr_p, Duration d) +Input +My_lily_parser::here_input () const { - 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; - Musical_pitch q = (*add_arr_p)[i]; - // duh, c7 should mean - if (q.notename_i_ == 6) - q.accidental_i_--; - p.transpose (q); - (*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; - Musical_pitch q = (*add_arr_p)[i]; - // duh, c7 should mean - if (q.notename_i_ == 6) - q.accidental_i_--; - p.transpose (q); - (*sub_arr_p)[i] = p; - } - sub_arr_p->sort (Musical_pitch::compare); - - Musical_pitch third (2); - Musical_pitch mthird (2, -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->push (p); - else if ((add_arr_p->top () < p) && (add_arr_p->top ().notename_i_ != p.notename_i_)) - add_arr_p->push (p); - add_arr_p->sort (Musical_pitch::compare); - - Array triads; - triads.push (third); // c e - triads.push (mthird); // d f - triads.push (mthird); // e g - triads.push (third); // f a - // 7 always seems means 7-... - triads.push (third); // g b -// triads.push (mthird); // g bes - triads.push (mthird); // a c - triads.push (mthird); // b d - /* - if first addition is 4, assume sus4 and don't add third implicitely + Parsing looks ahead , so we really want the previous location of the + lexer, not lexer_->here_input (). */ - Musical_pitch sus (3); - sus.transpose (tonic); - if (add_arr_p->size ()) - if ((*add_arr_p)[0] == sus) - missing.transpose (mthird); - /* - add missing triads + Actually, that gets very icky when there are white space, because + the line-numbers are all wrong. Let's try the character before + the current token. That gets the right result for + note/duration stuff, but doesn't mess up for errors in the 1st token of the line. + */ - for (int i = 0; i < add_arr_p->size (); i++) - { - Musical_pitch p = (*add_arr_p)[i]; - if (p > missing) - while (p > missing) - { - if (p.notename_i_ != missing.notename_i_) - { - if ((missing.notename_i_ - tonic.notename_i_ + 7) % 7 == 6) - { - Musical_pitch special_seven = missing; - Musical_pitch lower (0, -1); - special_seven.transpose (lower); - add_arr_p->insert (special_seven, i++); - } - else - add_arr_p->insert (missing, i++); - } - missing.transpose (triads[(missing.notename_i_ - tonic.notename_i_ + 7) % 7]); - } - else - i++; - } + Input hi (lexer_->here_input ()); - /* - 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; + char const * bla = hi.defined_str0_; + if (hi.line_number () > 1 + || hi.column_number () > 1) + bla --; + + return Input (hi.source_file_, bla); } -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); +#include "paper-def.hh" +#include "context-def.hh" - 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; - - /* 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; - - case '>': - case '!': - case '<': - reqs.push (new Span_dynamic_req); - break; - - case ')': - case '(': - { - reqs.push (new Slur_req); - } - break; - default: - assert (false); - break; - } - - switch (t) - { - case '<': - case '>': - case '(': - case '[': - dynamic_cast (reqs[0])->spantype = Span_req::START; - break; - - 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; - } + My_lily_parser * me = current_parser; - // ugh? don't we do this in the parser too? - reqs[0]->set_spot (here_input()); - return &reqs; -} + Music_output_def *id = unsmob_music_output_def (me->lexer_->lookup_identifier ("$defaultpaper")); + Paper_def *p = dynamic_cast (id->clone ()); -void -My_lily_parser::add_requests (Simultaneous_music*v) -{ - for (int i = 0; i < pre_reqs.size(); i++) + SCM al = p->translator_tab_->to_alist (); + SCM l = SCM_EOL; + for (SCM s = al ; gh_pair_p (s); s = ly_cdr (s)) { - v->add_music (pre_reqs[i]); + Context_def * td = unsmob_context_def (ly_cdar (s)); + l = gh_cons (gh_cons (ly_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()); -} - -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; } +