X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmy-lily-parser.cc;h=730a6db3430f9cbfbdc1c768369742de5ede32cd;hb=d9b43b93f2c885409bafdb157138158f65cc49aa;hp=73761360f9cd025f2ed8a70e3a621f13df2530a5;hpb=c8989177a23864cfa3d44e013585e719b816acfd;p=lilypond.git diff --git a/lily/my-lily-parser.cc b/lily/my-lily-parser.cc index 73761360f9..730a6db343 100644 --- a/lily/my-lily-parser.cc +++ b/lily/my-lily-parser.cc @@ -1,271 +1,126 @@ /* my-lily-parser.cc -- implement My_lily_parser - source file of the LilyPond music typesetter + source file of the GNU LilyPond music typesetter - (c) 1997 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys + Jan Nieuwenhuizen */ #include "my-lily-parser.hh" #include "my-lily-lexer.hh" #include "debug.hh" #include "main.hh" -#include "voice-element.hh" -#include "musical-request.hh" -#include "command-request.hh" #include "parser.hh" +#include "file-results.hh" +#include "scope.hh" -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() -{ -#ifndef NPRINT - String s = ""; - if (init_parse_b_) - s = "Init"; - set_yydebug( !monitor->silence(s+"Parser") && check_debug); - lexer_p_->set_debug( !monitor->silence(s+"Lexer") && check_debug); -#endif -} -void -My_lily_parser::print_declarations() -{ -#ifndef NPRINT - String s = ""; - if (init_parse_b_) - s = "Init"; - if (!monitor->silence(s+"Declarations") && check_debug) { - lexer_p_->print_declarations(init_parse_b_); - } -#endif -} - -void -My_lily_parser::do_init_file() -{ - init_parse_b_ = true; - set_debug(); - lexer_p_->new_input(init_str_, source_l_); -} - -void -My_lily_parser::parse_file(String init, String s) -{ - *mlog << "Parsing ... "; - lexer_p_ = new My_lily_lexer; - init_str_ = init; - - lexer_p_->new_input(s, source_l_); - do_yyparse(); - print_declarations(); - - if(!define_spot_array_.empty()) - warning("Braces don't match."); -} - -My_lily_parser::~My_lily_parser() -{ - delete lexer_p_; -} - -void -My_lily_parser::remember_spot() +My_lily_parser::My_lily_parser (Sources * source_l) { - define_spot_array_.push(here_input()); -} + source_l_ = source_l; + lexer_p_ = 0; + default_duration_ = Duration (2,0); + error_level_i_ = 0; + last_beam_start_ = SCM_EOL; -char const * -My_lily_parser::here_ch_C()const -{ - return lexer_p_->here_ch_C(); + default_header_p_ =0; } -void -My_lily_parser::parser_error(String s) +My_lily_parser::~My_lily_parser () { - here_input().error(s); - if ( fatal_error_i_ ) - exit( fatal_error_i_ ); - error_level_i_ = 1; + delete lexer_p_; + delete default_header_p_; } void -My_lily_parser::set_duration_mode(String s) +My_lily_parser::set_version_check (bool) { - s = s.upper_str(); - last_duration_mode = (s== "LAST"); } void -My_lily_parser::set_last_duration(Duration const *d) -{ - if (last_duration_mode) - default_duration_ = *d; -} - - -Voice_element* -My_lily_parser::get_word_element(Text_def* tdef_p, Duration * duration_p) +My_lily_parser::parse_file (String init, String s) { - Voice_element* velt_p = new Voice_element; - - 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; -} + lexer_p_ = new My_lily_lexer; -Voice_element * -My_lily_parser::get_rest_element(String, Duration * duration_p ) -{ - Voice_element* velt_p = new Voice_element; - velt_p->set_spot( here_input()); + lexer_p_->main_input_str_ = s; - Rest_req * rest_req_p = new Rest_req; - rest_req_p->duration_ = *duration_p; - rest_req_p->set_spot( here_input()); + progress_indication (_ ("Parsing...")); - velt_p->add(rest_req_p); - delete duration_p; - return velt_p; -} + set_yydebug (0); + lexer_p_->new_input (init, source_l_); + do_yyparse (); -Voice_element * -My_lily_parser::get_note_element(Note_req *rq, Duration * duration_p ) -{ - Voice_element*v = new Voice_element; - v->set_spot( here_input()); - - if (duration_p->type_i_ >= 2) { - Stem_req * stem_req_p = new Stem_req(); - stem_req_p->duration_ = *duration_p; - - stem_req_p->set_spot( here_input()); - v->add(stem_req_p); + progress_indication ("\n"); + + if (!define_spot_array_.empty ()) + { + define_spot_array_.top ().warning (_ ("Braces don't match")); + error_level_i_ = 1; } - rq->set_duration(*duration_p); - rq->set_spot( here_input()); + inclusion_global_array = lexer_p_->filename_str_arr_; - - v->add(rq); - delete duration_p ; - return v; + error_level_i_ = error_level_i_ | lexer_p_->errorlevel_i_; // ugh naming. } -Request* -My_lily_parser::get_parens_request(char c) +void +My_lily_parser::push_spot () { - Request* req_p=0; - switch (c) { - - case '[': - case ']': - { - Beam_req*b = new Beam_req; - int p_i=default_duration_.plet_.type_i_ ; // ugh . Should junk? - if (p_i!= 1) - b->nplet = p_i; - req_p = b; - } - break; - - case '>': - case '!': - case '<': - req_p = new Span_dynamic_req; - break; - - case ')': - case '(': - req_p = new Slur_req; - break; - default: - assert(false); - break; - } - - switch (c) { - case '<': - case '>': - case '(': - case '[': - req_p->span()->spantype = Span_req::START; - break; - case '!': - case ')': - case ']': - req_p->span()->spantype = Span_req::STOP; - break; - - default: - break; - } - - if (req_p->musical()->span_dynamic()) { - Span_dynamic_req* s_l= (req_p->musical()->span_dynamic()) ; - s_l->dynamic_dir_i_ = (c == '<') ? 1:-1; - } - - req_p->set_spot( here_input()); - return req_p; + define_spot_array_.push (here_input ()); } -My_lily_parser::My_lily_parser(Sources * source_l) +char const * +My_lily_parser::here_ch_C () const { - first_b_ = true; - source_l_ = source_l; - lexer_p_ = 0; - default_duration_.type_i_ = 4; - default_octave_i_ = 0; - textstyle_str_="roman"; // in lexer? - error_level_i_ = 0; - last_duration_mode = false; - fatal_error_i_ = 0; + return lexer_p_->here_ch_C (); } void -My_lily_parser::add_requests(Voice_element*v) +My_lily_parser::parser_error (String s) { - for (int i = 0; i < pre_reqs.size(); i++) { - v->add(pre_reqs[i]); - } - pre_reqs.set_size(0); - for (int i = 0; i add(post_reqs[i]); - } - post_reqs.set_size(0); + here_input ().error (s); + error_level_i_ = 1; + exit_status_global = 1; } + + Input -My_lily_parser::pop_spot() +My_lily_parser::pop_spot () { - return define_spot_array_.pop(); + return define_spot_array_.pop (); } Input -My_lily_parser::here_input()const +My_lily_parser::here_input () const { - Source_file * f_l= lexer_p_->source_file_l(); - return Input(f_l, here_ch_C()); + return lexer_p_->here_input (); } -void -My_lily_parser::add_notename(String s, Melodic_req * m_p) +// move me? +#include "paper-def.hh" +#include "translator-def.hh" + +My_lily_parser * current_parser; + +MAKE_SCHEME_CALLBACK (My_lily_parser,paper_description, 0); + +SCM +My_lily_parser::paper_description () { - lexer_p_->add_notename(s, m_p); + My_lily_parser * me = current_parser; + + Music_output_def *id = unsmob_music_output_def (me->lexer_p_->lookup_identifier ("$defaultpaper")); + Paper_def *p = dynamic_cast (id->clone ()); + + SCM al = p->translator_p_dict_p_->to_alist (); + SCM l = SCM_EOL; + for (SCM s = al ; gh_pair_p (s); s = ly_cdr (s)) + { + Translator_def * td = unsmob_translator_def (ly_cdar (s)); + l = gh_cons (gh_cons (ly_caar (s), td->to_alist ()), l); + } + return l; } + +