/*
- my-lily-parser.cc -- implement
+ 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 <hanwen@stack.nl>
+ (c) 1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ Jan Nieuwenhuizen <janneke@gnu.org>
*/
#include "my-lily-parser.hh"
#include "my-lily-lexer.hh"
#include "debug.hh"
#include "main.hh"
-#include "voice-element.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"
+
+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;
+ error_level_i_ = 0;
+ extender_req = 0;
+ fatal_error_i_ = 0;
+ default_header_p_ =0;
+}
-void
-My_lily_parser::set_debug()
+My_lily_parser::~My_lily_parser()
{
-#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
+ delete lexer_p_;
+ delete default_header_p_;
}
+
+
+
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
+My_lily_parser::set_version_check (bool ig)
+{
+ ignore_version_b_ = ig;
}
void
-My_lily_parser::parse_file(String init, String s)
+My_lily_parser::parse_file (String init, String s)
{
- *mlog << "Parsing ... ";
- lexer_p_ = new My_lily_lexer;
+ lexer_p_ = new My_lily_lexer;
+ init_str_ = init;
+ lexer_p_->main_input_str_ = s;
- set_debug();
+ *mlog << _ ("Parsing...");
- lexer_p_->new_input(init, source_l_);
- do_yyparse();
- print_declarations();
-
- init_parse_b_ = false;
- lexer_p_->new_input(s, source_l_);
- do_yyparse();
+ init_parse_b_ = false;
+ set_yydebug (!monitor->silent_b ("Parser") && check_debug);
+ lexer_p_->new_input (init, source_l_);
+ do_yyparse ();
+ if (!define_spot_array_.empty())
+ {
+ warning (_ ("braces don't match"));
+ error_level_i_ = 1;
+ }
- if(!define_spot_array_.empty())
- warning("Braces don't match.",0);
+ inclusion_global_array = lexer_p_->filename_str_arr_;
}
-My_lily_parser::~My_lily_parser()
-{
- delete lexer_p_;
-}
-
void
My_lily_parser::remember_spot()
{
- define_spot_array_.push(here_ch_C());
+ define_spot_array_.push (here_input());
}
-char const *
-My_lily_parser::here_ch_C()const
+char 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)
+My_lily_parser::parser_error (String s)
{
- lexer_p_->LexerError(s);
-
- if ( fatal_error_i_ )
- exit( fatal_error_i_ );
- error_level_i_ = 1;
+ 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)
+My_lily_parser::set_abbrev_beam (int type_i)
{
- s = s.upper_str();
- last_duration_mode = (s== "LAST");
+ abbrev_beam_type_i_ = type_i;
}
+
void
-My_lily_parser::set_last_duration(Duration const *d)
+My_lily_parser::set_last_duration (Duration const *d)
{
- if (last_duration_mode)
- default_duration_ = *d;
+ default_duration_ = *d;
+
+ /*
+ forget plet part,
+ but keep sticky plet factor within plet brackets
+ */
+ default_duration_.plet_ = plet_;
}
-Voice_element*
-My_lily_parser::get_word_element(Text_def* tdef_p, Duration * duration_p)
+Simultaneous_music*
+My_lily_parser::get_word_element (String s, Duration * duration_p)
{
- Voice_element* velt_p = new Voice_element;
-
- Lyric_req* lreq_p = new Lyric_req(tdef_p);
+ Simultaneous_music* velt_p = new Request_chord;
- lreq_p->duration_ = *duration_p;
- lreq_p->print();
- lreq_p->defined_ch_C_ = here_ch_C();
+ 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(lreq_p);
+ velt_p->add_music (lreq_p);
- delete duration_p;
- return velt_p;
+ delete duration_p;
+ return velt_p;
}
-Voice_element *
-My_lily_parser::get_rest_element(String, Duration * duration_p )
-{
- Voice_element* velt_p = new Voice_element;
- velt_p->defined_ch_C_ = lexer_p_->here_ch_C();
- Rest_req * rest_req_p = new Rest_req;
- rest_req_p->duration_ = *duration_p;
- rest_req_p->print();
- rest_req_p->defined_ch_C_ = here_ch_C();
+Simultaneous_music *
+My_lily_parser::get_rest_element (String s, Duration * duration_p)
+{
+ 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);
+ }
- velt_p->add(rest_req_p);
- delete duration_p;
- return velt_p;
+ delete duration_p;
+ return velt_p;
}
-Voice_element *
-My_lily_parser::get_note_element(Note_req *rq, Duration * duration_p )
+Simultaneous_music *
+My_lily_parser::get_chord (Musical_pitch tonic, Array<Musical_pitch>* add_arr_p, Array<Musical_pitch>* sub_arr_p, Duration d)
{
- Voice_element*v = new Voice_element;
- v->defined_ch_C_ = here_ch_C();
-
- if (duration_p->type_i_ >= 2) {
- Stem_req * stem_req_p = new Stem_req();
- stem_req_p->duration_ = *duration_p;
-
- stem_req_p->defined_ch_C_ = here_ch_C();
- v->add(stem_req_p);
- }
+ 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);
- rq->set_duration(*duration_p);
- rq->defined_ch_C_ = here_ch_C();
+ 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 <c bes>
+ 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 <c bes>
+ 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<Musical_pitch> 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
+ */
+ Musical_pitch sus (3);
+ sus.transpose (tonic);
+ if (add_arr_p->size ())
+ if ((*add_arr_p)[0] == sus)
+ missing.transpose (mthird);
+
+ /*
+ add missing triads
+ */
+ 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++;
+ }
+ /*
+ 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->add(rq);
- delete duration_p ;
- return v;
+ v->set_spot (here_input ());
+ return v;
}
-Request*
-My_lily_parser::get_parens_request(char c)
+Simultaneous_music *
+My_lily_parser::get_note_element (Note_req *rq, Duration * duration_p)
{
- Request* req_p=0;
- switch (c) {
- case '|':
- req_p = new Barcheck_req;
- break;
+ Simultaneous_music*v = new Request_chord;
+ v->set_spot (here_input ());
- case '[':
- case ']':
+ v->add_music (rq);
+
+ // too bad parser reads (default) duration via member access,
+ // this hack will do for now..
+ if (abbrev_beam_type_i_)
{
- 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;
+ assert (!duration_p->plet_b ());
+ duration_p->set_plet (1, 2);
}
- break;
+ rq->duration_ = *duration_p;
+ rq->set_spot (here_input ());
+ delete duration_p ;
+ return v;
+}
+/*
+ UGH.
+ */
+Array<Request*>*
+My_lily_parser::get_parens_request (int t)
+{
+ Array<Request*>& reqs = *new Array<Request*>;
+ 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 '(':
- req_p = new Slur_req;
- break;
+ {
+ reqs.push (new Slur_req);
+ }
+ break;
default:
- assert(false);
- break;
+ assert (false);
+ break;
}
-
- switch (c) {
+
+ switch (t)
+ {
+ case BEAMPLET:
+ dynamic_cast<Span_req*> (reqs.top ())->spantype = Span_req::START;
+ /* fall through */
+ case '<':
+ case '>':
case '(':
case '[':
- req_p->span()->spantype = Span_req::START;
- break;
+ case PLET:
+ dynamic_cast<Span_req*> (reqs.top ())->spantype = Span_req::START;
+ break;
+ case MAEBTELP:
+ dynamic_cast<Span_req*> (reqs.top ())->spantype = Span_req::STOP;
+ /* fall through */
+ case '!':
case ')':
case ']':
- req_p->span()->spantype = Span_req::STOP;
- break;
-
+ dynamic_cast<Span_req*> (reqs[0])->spantype = Span_req::STOP;
+ break;
+
default:
- break;
+ break;
}
- req_p->defined_ch_C_ = here_ch_C();
- return req_p;
-}
+ for (int i = 0; i < reqs.size (); i++)
+ if (dynamic_cast<Span_dynamic_req*> (reqs[i]))
+ {
+ Span_dynamic_req* s_l= dynamic_cast<Span_dynamic_req*> (reqs[i]);
+ s_l->dynamic_dir_ = (t == '<') ? UP:DOWN;
+ }
-My_lily_parser::My_lily_parser(Sources * source_l)
-{
- 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;
- defined_ch_C_ = 0;
- fatal_error_i_ = 0;
+ // ugh? don't we do this in the parser too?
+ reqs[0]->set_spot (here_input());
+ return &reqs;
}
void
-My_lily_parser::add_requests(Voice_element*v)
+My_lily_parser::add_requests (Simultaneous_music*v)
{
- for (int i = 0; i < pre_reqs.size(); i++) {
- v->add(pre_reqs[i]);
+ for (int i = 0; i < pre_reqs.size(); i++)
+ {
+ v->add_music (pre_reqs[i]);
}
- pre_reqs.set_size(0);
- for (int i = 0; i <post_reqs.size(); i++) {
- v->add(post_reqs[i]);
+ pre_reqs.clear();
+ for (int i = 0; i <post_reqs.size(); i++)
+ {
+ v->add_music (post_reqs[i]);
}
- post_reqs.set_size(0);
+
+ 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 ;
+}
+