release: 1.3.107

[lilypond.git] / lily / my-lily-parser.cc

diff --git a/lily/my-lily-parser.cc b/lily/my-lily-parser.cc
index aaae6a6d943136588b8d678b5794c1f4114584f9..14b22940d8a7eb9ef12bb7ab013d716dd5507707 100644 (file)
--- a/lily/my-lily-parser.cc
+++ b/lily/my-lily-parser.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
        Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
@@ -11,28 +11,18 @@
 #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;
-  abbrev_beam_type_i_ = 0;
-  default_duration_.durlog_i_ = 2;
-  default_pitch_ = Musical_pitch (5*7, 0);
+  default_duration_ = Duration (2,0);
   error_level_i_ = 0;
 
-  fatal_error_i_ = 0;
+
   default_header_p_ =0;
 }
 
@@ -42,31 +32,27 @@ My_lily_parser::~My_lily_parser()
   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 (flower_dstream &&!flower_dstream->silent_b ("Parser"));
   lexer_p_->new_input (init, source_l_);
   do_yyparse ();
 
   if (!define_spot_array_.empty())
     {
-      warning (_ ("Braces don't match"));
+      define_spot_array_.top ().warning (_ ("Braces don't match"));
       error_level_i_ = 1;
     }
 
@@ -91,8 +77,6 @@ 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;
 }
@@ -103,89 +87,6 @@ My_lily_parser::set_last_duration (Duration const *d)
   default_duration_ = *d;
 }
 
-void
-My_lily_parser::set_abbrev_beam (int type_i)
-{
-  abbrev_beam_type_i_ = type_i;
-}
-
-void
-My_lily_parser::set_last_pitch (Musical_pitch const* p)
-{
-  default_pitch_ = *p;
-}
-
-// junk me
-Simultaneous_music*
-My_lily_parser::get_word_element (String s, Duration * duration_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_music (lreq_p);
-
-  delete  duration_p;
-  return velt_p;
-}
-
-// 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());
-
-      velt_p->add_music (rest_req_p);
-    }
-
-  delete duration_p;
-  return velt_p;
-}
-
-// 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)
-{
-  Simultaneous_music*v = new Request_chord;
-  v->set_spot (here_input ());
-
-  Chord chord (tonic, add_arr_p, sub_arr_p, inversion_p);
-
-  Tonic_req* t = new Tonic_req;
-  t->pitch_ = tonic;
-  v->add_music (t);
-
-  for (int i = 0; i < chord.pitch_arr_.size (); i++)
-    {
-      Musical_pitch p = chord.pitch_arr_[i];
-      Note_req* n = new Note_req;
-      n->pitch_ = p;
-      n->duration_ = d;
-      v->add_music (n);
-    }
-
-  return v;
-}
-
-
 
 Input
 My_lily_parser::pop_spot()
@@ -199,17 +100,31 @@ My_lily_parser::here_input() const
   return  lexer_p_->here_input ();
 }
 
-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 ;
-}
+// move me?
+#include "paper-def.hh"
+#include "identifier.hh"
+#include "translator-def.hh"
 
-Midi_def*
-My_lily_parser::default_midi_p ()
+My_lily_parser * current_parser;
+
+MAKE_SCHEME_CALLBACK(My_lily_parser,paper_description, 0);
+
+SCM
+My_lily_parser::paper_description ()
 {
-  Identifier *id = lexer_p_->lookup_identifier ("$defaultmidi");
-  return id ? id->access_content_Midi_def (true) : new Midi_def ;
+  My_lily_parser * me = current_parser;
+
+  Identifier *id = unsmob_identifier (me->lexer_p_->lookup_identifier ("$defaultpaper"));
+  Paper_def *p = dynamic_cast<Paper_def*> (id->access_content_Music_output_def (false));
+
+  SCM al = p->translator_p_dict_p_->to_alist ();
+  SCM l = SCM_EOL;
+  for (SCM s = al ; gh_pair_p (s); s = gh_cdr (s))
+    {
+      Translator_def * td = unsmob_translator_def (gh_cdar (s));
+      l = gh_cons (gh_cons (gh_caar (s), td->to_alist ()),  l);
+    }
+  return l;  
 }
+