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>
*/
#include "my-lily-parser.hh"
#include "musical-request.hh"
#include "command-request.hh"
#include "parser.hh"
-#include "header.hh"
+#include "scope.hh"
+#include "file-results.hh"
+#include "midi-def.hh"
+#include "paper-def.hh"
+#include "identifier.hh"
-
-void
-My_lily_parser::clear_notenames()
-{
- lexer_p_->clear_notenames();
-}
-void
-My_lily_parser::set_version_check (bool ig)
+My_lily_parser::My_lily_parser (Sources * source_l)
{
- ignore_version_b_ = ig;
+ 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;
+ 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()
+My_lily_parser::set_version_check (bool ig)
{
-#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
+ ignore_version_b_ = ig;
}
void
{
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();
- print_declarations();
+ lexer_p_->main_input_str_ = s;
+
+ *mlog << _ ("Parsing...");
init_parse_b_ = false;
- set_debug();
- lexer_p_->new_input (s , source_l_);
- do_yyparse();
- print_declarations();
+ 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.");
-}
+ {
+ warning (_ ("braces don't match"));
+ error_level_i_ = 1;
+ }
-My_lily_parser::~My_lily_parser()
-{
- delete lexer_p_;
- delete default_header_p_;
+ inclusion_global_array = lexer_p_->filename_str_arr_;
}
-
+
void
My_lily_parser::remember_spot()
{
define_spot_array_.push (here_input());
}
-char const *
+char const *
My_lily_parser::here_ch_C() const
{
return lexer_p_->here_ch_C();
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_default_duration (Duration const *d)
+My_lily_parser::set_abbrev_beam (int type_i)
{
- last_duration_mode_b_ = false;
- default_duration_ = *d;
+ abbrev_beam_type_i_ = type_i;
}
void
My_lily_parser::set_last_duration (Duration const *d)
{
- if (last_duration_mode_b_)
- default_duration_ = *d;
+ default_duration_ = *d;
+
+ /*
+ forget plet part,
+ but keep sticky plet factor within plet brackets
+ */
+ default_duration_.plet_ = plet_;
}
-Chord*
-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)
{
- Chord* velt_p = new Request_chord;
-
- Lyric_req* lreq_p = new Lyric_req (tdef_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 (lreq_p);
+ velt_p->add_music (lreq_p);
delete duration_p;
return velt_p;
}
-Chord *
+
+Simultaneous_music *
My_lily_parser::get_rest_element (String s, Duration * duration_p)
-{
- Chord* velt_p = new Request_chord;
+{
+ 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_req * skip_p = new Skip_req;
+ skip_p->duration_ = *duration_p;
- skip_p->set_spot (here_input());
- velt_p->add (skip_p);
+ skip_p->set_spot (here_input());
+ velt_p->add_music (skip_p);
}
- else
+ 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);
+
+ velt_p->add_music (rest_req_p);
}
delete duration_p;
return velt_p;
}
-Chord *
+Simultaneous_music *
My_lily_parser::get_note_element (Note_req *rq, Duration * duration_p)
{
- Chord*v = new Request_chord;
- v->set_spot (here_input());
+ Simultaneous_music*v = new Request_chord;
+ v->set_spot (here_input ());
+
+ v->add_music (rq);
- v->add (rq);
-
- rq->set_duration (*duration_p);
- rq->set_spot (here_input());
+ // 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;
}
-Request*
-My_lily_parser::get_parens_request (char c)
+Array<Request*>*
+My_lily_parser::get_parens_request (int t)
{
- Request* req_p=0;
- switch (c)
+ Array<Request*>& reqs = *new Array<Request*>;
+ switch (t)
{
-
case '~':
- req_p = new Tie_req;
+ 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 ']':
{
- Beam_req*b = new Beam_req;
- int p_i=plet_.type_i_ ; // ugh . Should junk?
- if (p_i!= 1)
- b->nplet = p_i;
- req_p = b;
+ 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;
+ break;
case '>':
case '!':
case '<':
- req_p = new Span_dynamic_req;
+ 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;
+ {
+ reqs.push (new Slur_req);
+ }
break;
default:
assert (false);
break;
}
-
- switch (c)
+
+ switch (t)
{
+ case BEAMPLET:
+ reqs.top ()->access_Span_req ()->spantype = Span_req::START;
+ /* fall through */
case '<':
case '>':
case '(':
case '[':
- req_p->span()->spantype = Span_req::START;
+ case PLET:
+ reqs[0]->access_Span_req ()->spantype = Span_req::START;
break;
+ case MAEBTELP:
+ reqs.top ()->access_Span_req ()->spantype = Span_req::STOP;
+ /* fall through */
case '!':
case ')':
case ']':
- req_p->span()->spantype = Span_req::STOP;
+ reqs[0]->access_Span_req ()->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_ = (c == '<') ? UP:DOWN;
- }
-
- req_p->set_spot (here_input());
- return req_p;
-}
+ for (int i = 0; i < reqs.size (); i++)
+ if (reqs[i]->access_Musical_req ()->access_Span_dynamic_req ())
+ {
+ Span_dynamic_req* s_l= reqs[i]->access_Musical_req ()->access_Span_dynamic_req ();
+ s_l->dynamic_dir_ = (t == '<') ? UP:DOWN;
+ }
-My_lily_parser::My_lily_parser (Sources * source_l)
-{
- first_b_ = true;
- source_l_ = source_l;
- lexer_p_ = 0;
- default_duration_.durlog_i_ = 2;
- default_octave_i_ = 0;
- textstyle_str_="roman"; // in lexer?
- error_level_i_ = 0;
- last_duration_mode_b_ = true;
- fatal_error_i_ = 0;
- default_header_p_ =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 (Chord*v)
+My_lily_parser::add_requests (Simultaneous_music*v)
{
- for (int i = 0; i < pre_reqs.size(); i++)
+ for (int i = 0; i < pre_reqs.size(); i++)
{
- v->add (pre_reqs[i]);
+ v->add_music (pre_reqs[i]);
}
pre_reqs.clear();
- for (int i = 0; i <post_reqs.size(); i++)
+ for (int i = 0; i <post_reqs.size(); i++)
{
- v->add (post_reqs[i]);
+ v->add_music (post_reqs[i]);
}
+
post_reqs.clear();
}
}
void
-My_lily_parser::add_notename (String s, Melodic_req * m_p)
+My_lily_parser::add_notename (String s, Musical_pitch p)
+{
+ lexer_p_->add_notename (s, p);
+
+}
+
+Paper_def*
+My_lily_parser::default_paper_p ()
{
- lexer_p_->add_notename (s, m_p);
+ Identifier *id = lexer_p_->lookup_identifier ("$defaultpaper");
+ return id ? id->access_Paper_def () : new Paper_def ;
}
+
+Midi_def*
+My_lily_parser::default_midi_p ()
+{
+ Identifier *id = lexer_p_->lookup_identifier ("$defaultmidi");
+ return id ? id->access_Midi_def () : new Midi_def ;
+}
+
projects / lilypond.git / blobdiff