release: 1.5.29

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

diff --git a/lily/my-lily-parser.cc b/lily/my-lily-parser.cc
index 65e3c69adc6c3ea1b11e35d7d4c506eacf6f0976..730a6db3430f9cbfbdc1c768369742de5ede32cd 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--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
        Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
@@ -11,39 +11,30 @@
 #include "my-lily-lexer.hh"
 #include "debug.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 "scope.hh"
 
 My_lily_parser::My_lily_parser (Sources * source_l)
 {
   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
@@ -53,15 +44,17 @@ My_lily_parser::parse_file (String init, String s)
 
   lexer_p_->main_input_str_ = s;
 
-  progress_indication (_("Parsing..."));
+  progress_indication (_ ("Parsing..."));
 
-  set_yydebug (flower_dstream &&!flower_dstream->silent_b ("Parser"));
+  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;
     }
 
@@ -71,100 +64,63 @@ My_lily_parser::parse_file (String init, String s)
 }
 
 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_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 ());
+  return  lexer_p_->here_input ();
+}
 
-  /*
-    UARGAUGRAGRUAUGRUINAGRAUGIRNA
+// move me?
+#include "paper-def.hh"
+#include "translator-def.hh"
 
-    ugh
-   */
-  Chord chord = to_chord (tonic, add_arr_p, sub_arr_p, inversion_p, bass_p);
-  inversion_p = 0;
-  bass_p = 0;
+My_lily_parser * current_parser;
 
-  Tonic_req* t = new Tonic_req;
-  t->pitch_ = tonic;
-  v->add_music (t);
+MAKE_SCHEME_CALLBACK (My_lily_parser,paper_description, 0);
 
-  //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);
-    }
+SCM
+My_lily_parser::paper_description ()
+{
+  My_lily_parser * me = current_parser;
 
-  if (chord.bass_b_)
-    {
-      Bass_req* b = new Bass_req;
-      b->pitch_ = chord.bass_pitch_;
-      v->add_music (b);
-    }
+  Music_output_def *id = unsmob_music_output_def (me->lexer_p_->lookup_identifier ("$defaultpaper"));
+  Paper_def *p = dynamic_cast<Paper_def*> (id->clone ());
 
-  Array<Musical_pitch> pitch_arr = chord.to_pitch_arr ();
-  for (int i = 0; i < 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 = 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();
+  return l;  
 }
-
-Input
-My_lily_parser::here_input() const
-{
-  return  lexer_p_->here_input ();
-}
-
-
+