source file of the GNU LilyPond music typesetter
- (c) 1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
Jan Nieuwenhuizen <janneke@gnu.org>
*/
#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 "scope.hh"
#include "file-results.hh"
-#include "midi-def.hh"
-#include "paper-def.hh"
-#include "identifier.hh"
-#include "chord.hh"
+#include "scope.hh"
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_duration_ = Duration (2,0);
error_level_i_ = 0;
+ last_beam_start_ = SCM_EOL;
- fatal_error_i_ = 0;
default_header_p_ =0;
}
-My_lily_parser::~My_lily_parser()
+My_lily_parser::~My_lily_parser ()
{
delete lexer_p_;
delete default_header_p_;
}
-
-
void
-My_lily_parser::set_version_check (bool ig)
+My_lily_parser::set_version_check (bool)
{
- ignore_version_b_ = ig;
}
void
My_lily_parser::parse_file (String init, String s)
{
lexer_p_ = new My_lily_lexer;
- init_str_ = init;
+
lexer_p_->main_input_str_ = s;
- *mlog << _ ("Parsing...");
+ progress_indication (_ ("Parsing..."));
- init_parse_b_ = false;
- set_yydebug (!monitor->silent_b ("Parser") && check_debug);
+ set_yydebug (0);
lexer_p_->new_input (init, source_l_);
do_yyparse ();
- if (!define_spot_array_.empty())
+ progress_indication ("\n");
+
+ if (!define_spot_array_.empty ())
{
- warning (_ ("braces don't match"));
+ define_spot_array_.top ().warning (_ ("Braces don't match"));
error_level_i_ = 1;
}
}
void
-My_lily_parser::remember_spot()
+My_lily_parser::push_spot ()
{
- define_spot_array_.push (here_input());
+ define_spot_array_.push (here_input ());
}
char const *
-My_lily_parser::here_ch_C() 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)
{
- here_input().error (s);
- if (fatal_error_i_)
- exit (fatal_error_i_);
+ here_input ().error (s);
error_level_i_ = 1;
- exit_status_i_ = 1;
+ exit_status_global = 1;
}
-void
-My_lily_parser::set_last_duration (Duration const *d)
+Input
+My_lily_parser::pop_spot ()
{
- default_duration_ = *d;
+ return define_spot_array_.pop ();
}
-// junk me
-Simultaneous_music*
-My_lily_parser::get_word_element (String s, Duration * duration_p)
+Input
+My_lily_parser::here_input () const
{
- 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;
+ return lexer_p_->here_input ();
}
-// junk me
-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());
+// move me?
+#include "paper-def.hh"
+#include "translator-def.hh"
- velt_p->add_music (rest_req_p);
- }
+My_lily_parser * current_parser;
- delete duration_p;
- return velt_p;
-}
+MAKE_SCHEME_CALLBACK (My_lily_parser,paper_description, 0);
-// junk me
-Simultaneous_music *
-My_lily_parser::get_chord (Musical_pitch tonic, Array<Musical_pitch>* add_arr_p, Array<Musical_pitch>* sub_arr_p, Musical_pitch* inversion_p, Duration d)
+SCM
+My_lily_parser::paper_description ()
{
- Simultaneous_music*v = new Request_chord;
- v->set_spot (here_input ());
-
- Chord chord (tonic, add_arr_p, sub_arr_p, inversion_p);
+ My_lily_parser * me = current_parser;
- Tonic_req* t = new Tonic_req;
- t->pitch_ = tonic;
- v->add_music (t);
+ Music_output_def *id = unsmob_music_output_def (me->lexer_p_->lookup_identifier ("$defaultpaper"));
+ Paper_def *p = dynamic_cast<Paper_def*> (id->clone ());
- for (int i = 0; i < chord.pitch_arr_.size (); i++)
+ 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))
{
- Musical_pitch p = chord.pitch_arr_[i];
- Note_req* n = new Note_req;
- n->pitch_ = p;
- n->duration_ = d;
- v->add_music (n);
+ Translator_def * td = unsmob_translator_def (ly_cdar (s));
+ l = gh_cons (gh_cons (ly_caar (s), td->to_alist ()), l);
}
-
- return v;
-}
-
-
-
-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;
}
+
projects / lilypond.git / blobdiff