source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2004 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 "warn.hh"
#include "main.hh"
-#include "music-list.hh"
-#include "musical-request.hh"
-#include "command-request.hh"
-#include "lily-guile.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 "input-file-results.hh"
+#include "scm-hash.hh"
-My_lily_parser::My_lily_parser (Sources * source_l)
+My_lily_parser::My_lily_parser (Input_file_results * source)
{
- source_l_ = source_l;
- lexer_p_ = 0;
- default_duration_.durlog_i_ = 2;
- error_level_i_ = 0;
+ input_file_ = source;
+ lexer_ = 0;
+ default_duration_ = Duration (2,0);
+ error_level_ = 0;
+ last_beam_start_ = SCM_EOL;
- fatal_error_i_ = 0;
- default_header_p_ =0;
+ default_header_ =0;
}
-My_lily_parser::~My_lily_parser()
+My_lily_parser::~My_lily_parser ()
{
- delete lexer_p_;
- delete default_header_p_;
+ delete lexer_;
+ if (default_header_)
+ scm_gc_unprotect_object (default_header_->self_scm());
}
-void
-My_lily_parser::set_version_check (bool ig)
-{
-}
void
-My_lily_parser::parse_file (String init, String s)
+My_lily_parser::parse_file (String init, String in_file, String out_file)
{
- lexer_p_ = new My_lily_lexer;
-
- lexer_p_->main_input_str_ = s;
+ lexer_ = new My_lily_lexer;
+ output_basename_ = out_file;
+
+ lexer_->main_input_name_ = in_file;
- progress_indication (_("Parsing..."));
+ progress_indication (_ ("Parsing..."));
- set_yydebug (flower_dstream &&!flower_dstream->silent_b ("Parser"));
- lexer_p_->new_input (init, source_l_);
+ set_yydebug (0);
+ lexer_->new_input (init, &input_file_->sources_);
do_yyparse ();
- if (!define_spot_array_.empty())
+ progress_indication ("\n");
+
+ if (!define_spots_.empty ())
{
- warning (_ ("Braces don't match"));
- error_level_i_ = 1;
+ define_spots_.top ().warning (_ ("Braces don't match"));
+ error_level_ = 1;
}
- inclusion_global_array = lexer_p_->filename_str_arr_;
+ input_file_->inclusion_names_ = lexer_->filename_strings_;
- error_level_i_ = error_level_i_ | lexer_p_->errorlevel_i_; // ugh naming.
+ error_level_ = error_level_ | lexer_->errorlevel_; // ugh naming.
}
void
-My_lily_parser::remember_spot()
+My_lily_parser::push_spot ()
{
- define_spot_array_.push (here_input());
+ define_spots_.push (here_input ());
}
char const *
-My_lily_parser::here_ch_C() const
+My_lily_parser::here_str0 () const
{
- return lexer_p_->here_ch_C();
+ return lexer_->here_str0 ();
}
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;
+ here_input ().error (s);
+ error_level_ = 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_spots_.pop ();
}
-// 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,
- Musical_pitch* bass_p,
- Duration d)
+Input
+My_lily_parser::here_input () const
{
- Simultaneous_music*v = new Request_chord;
- v->set_spot (here_input ());
-
/*
- UARGAUGRAGRUAUGRUINAGRAUGIRNA
-
- ugh
+ Parsing looks ahead , so we really want the previous location of the
+ lexer, not lexer_->here_input().
*/
- Chord chord = to_chord (tonic, add_arr_p, sub_arr_p, inversion_p, bass_p);
- inversion_p = 0;
- bass_p = 0;
-
- Tonic_req* t = new Tonic_req;
- t->pitch_ = tonic;
- v->add_music (t);
-
- //urg
- if (chord.inversion_b_
- && Chord::find_notename_i (&chord.pitch_arr_, chord.inversion_pitch_) > 0)
- {
- Inversion_req* i = new Inversion_req;
- i->pitch_ = chord.inversion_pitch_;
- v->add_music (i);
- }
-
- if (chord.bass_b_)
- {
- Bass_req* b = new Bass_req;
- b->pitch_ = chord.bass_pitch_;
- v->add_music (b);
- }
-
- Array<Musical_pitch> pitch_arr = chord.to_pitch_arr ();
- for (int i = 0; i < pitch_arr.size (); i++)
- {
- Musical_pitch p = pitch_arr[i];
- Note_req* n = new Note_req;
- n->pitch_ = p;
- n->duration_ = d;
- v->add_music (n);
- }
-
- return v;
+ /*
+ Actually, that gets very icky when there are white space, because
+ the line-numbers are all wrong. Let's try the character before
+ the current token. That gets the right result for
+ note/duration stuff, but doesn't mess up for errors in the 1st token of the line.
+
+ */
+ Input hi (lexer_->here_input ());
+
+ char const * bla = hi.defined_str0_;
+ if (hi.line_number () > 1
+ || hi.column_number () > 1)
+ bla --;
+
+ return Input (hi.source_file_, bla);
}
+#include "paper-def.hh"
+#include "context-def.hh"
+My_lily_parser * current_parser;
-Input
-My_lily_parser::pop_spot()
-{
- return define_spot_array_.pop();
-}
+MAKE_SCHEME_CALLBACK (My_lily_parser,paper_description, 0);
-Input
-My_lily_parser::here_input() const
+SCM
+My_lily_parser::paper_description ()
{
- return lexer_p_->here_input ();
-}
+ My_lily_parser * me = current_parser;
+ Music_output_def *id = unsmob_music_output_def (me->lexer_->lookup_identifier ("$defaultpaper"));
+ Paper_def *p = dynamic_cast<Paper_def*> (id->clone ());
+ SCM al = p->translator_tab_->to_alist ();
+ SCM l = SCM_EOL;
+ for (SCM s = al ; gh_pair_p (s); s = ly_cdr (s))
+ {
+ Context_def * td = unsmob_context_def (ly_cdar (s));
+ l = gh_cons (gh_cons (ly_caar (s), td->to_alist ()), l);
+ }
+ return l;
+}
+
projects / lilypond.git / blobdiff