X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmy-lily-parser.cc;h=846d4bd2affbe1e4600fa0d355d2f75668474a5c;hb=94189ec2b8da6d7e89dc619c646a927adead9b19;hp=aaaf7201b2c5a1fdc39f4e25ff3621a7ab1bdef1;hpb=745b9d0980d8811783e4fe62380363d05fd6140c;p=lilypond.git diff --git a/lily/my-lily-parser.cc b/lily/my-lily-parser.cc index aaaf7201b2..846d4bd2af 100644 --- a/lily/my-lily-parser.cc +++ b/lily/my-lily-parser.cc @@ -3,32 +3,26 @@ source file of the GNU LilyPond music typesetter - (c) 1997 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 "header.hh" - +#include "file-results.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_octave_i_ = 0; - textstyle_str_="roman"; // in lexer? + default_duration_ = Duration (2,0); error_level_i_ = 0; - last_duration_mode_b_ = true; - fatal_error_i_ = 0; + + default_header_p_ =0; } @@ -38,76 +32,33 @@ My_lily_parser::~My_lily_parser() delete default_header_p_; } - -void -My_lily_parser::clear_notenames() -{ - lexer_p_->clear_notenames(); -} - -void -My_lily_parser::set_version_check (bool ig) -{ - ignore_version_b_ = ig; -} void -My_lily_parser::set_debug() +My_lily_parser::set_version_check (bool ) { -#ifndef NPRINT - String s = ""; - if (init_parse_b_) - s = "Init"; - set_yydebug (!monitor->silent_b (s+"Parser") && check_debug); - lexer_p_->set_debug (!monitor->silent_b (s+"Lexer") && check_debug); -#endif -} - -void -My_lily_parser::print_declarations() -{ -#ifndef NPRINT - String s = ""; - - if (init_parse_b_) - s = "Init"; - if (!monitor->silent_b (s+"Declarations") && check_debug) - { - lexer_p_->print_declarations (init_parse_b_); - } -#endif } void My_lily_parser::parse_file (String init, String s) { lexer_p_ = new My_lily_lexer; - init_str_ = init; - *mlog << _("Parsing ... "); - - init_parse_b_ = true; - set_debug(); - lexer_p_->new_input (init, source_l_); - do_yyparse(); - - if (error_level_i_) - { - error (_("Found errors in init files")); - } - print_declarations(); + lexer_p_->main_input_str_ = s; - init_parse_b_ = false; - set_debug(); - lexer_p_->new_input (s , source_l_); - do_yyparse(); - print_declarations(); + progress_indication (_("Parsing...")); + set_yydebug (flower_dstream &&!flower_dstream->silent_b ("Parser")); + lexer_p_->new_input (init, source_l_); + do_yyparse (); 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 @@ -126,232 +77,53 @@ 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_duration_mode (String s) -{ - s = s.upper_str(); - last_duration_mode_b_ = (s== "LAST"); -} - -void -My_lily_parser::set_abbrev_beam (int type_i) -{ - abbrev_beam_type_i_ = type_i; + exit_status_global = 1; } -void -My_lily_parser::set_default_duration (Duration const *d) -{ - last_duration_mode_b_ = false; - default_duration_ = *d; -} - - void My_lily_parser::set_last_duration (Duration const *d) { - if (last_duration_mode_b_) - default_duration_ = *d; + default_duration_ = *d; } -Chord* -My_lily_parser::get_word_element (Text_def* tdef_p, Duration * duration_p) +Input +My_lily_parser::pop_spot() { - Chord* velt_p = new Request_chord; - - Lyric_req* lreq_p = new Lyric_req (tdef_p); - - lreq_p->duration_ = *duration_p; - lreq_p->set_spot (here_input()); - - velt_p->add (lreq_p); - - delete duration_p; - return velt_p; + return define_spot_array_.pop(); } -Chord * -My_lily_parser::get_rest_element (String s, Duration * duration_p) +Input +My_lily_parser::here_input() const { - Chord* 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 (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 (rest_req_p); - } - - delete duration_p; - return velt_p; + return lexer_p_->here_input (); } -Chord * -My_lily_parser::get_note_element (Note_req *rq, Duration * duration_p) -{ - Chord*v = new Request_chord; - v->set_spot (here_input ()); +// move me? +#include "paper-def.hh" +#include "translator-def.hh" - v->add (rq); +My_lily_parser * current_parser; - // 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->set_duration (*duration_p); - rq->set_spot (here_input ()); - delete duration_p ; - return v; -} +MAKE_SCHEME_CALLBACK(My_lily_parser,paper_description, 0); -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; - - case '>': - case '!': - case '<': - reqs.push (new Span_dynamic_req); - break; - - 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: - reqs.top ()->span()->spantype = Span_req::START; - /* fall through */ - case '<': - case '>': - case '(': - case '[': - case PLET: - reqs[0]->span ()->spantype = Span_req::START; - break; - case MAEBTELP: - reqs.top ()->span()->spantype = Span_req::STOP; - /* fall through */ - case '!': - case ')': - case ']': - reqs[0]->span ()->spantype = Span_req::STOP; - break; + My_lily_parser * me = current_parser; - default: - break; - } - - for (int i = 0; i < reqs.size (); i++) - if (reqs[i]->musical ()->span_dynamic ()) - { - Span_dynamic_req* s_l= (reqs[i]->musical ()->span_dynamic ()) ; - 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; -} + Music_output_def *id = unsmob_music_output_def (me->lexer_p_->lookup_identifier ("$defaultpaper")); + Paper_def *p = dynamic_cast (id->clone ()); -void -My_lily_parser::add_requests (Chord*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 (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 (post_reqs[i]); - } - post_reqs.clear(); -} - -Input -My_lily_parser::pop_spot() -{ - return define_spot_array_.pop(); + return l; } + -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, Melodic_req * m_p) -{ - lexer_p_->add_notename (s, m_p); -}