patch::: 1.3.87.jcn2

[lilypond.git] / lily / music-iterator.cc

diff --git a/lily/music-iterator.cc b/lily/music-iterator.cc
index bfa597527b0dd5464fdf5cd82f5bc5bc1ad27457..3806c4e7f7e69a30d47ad029a184428b9dca5a46 100644 (file)
--- a/lily/music-iterator.cc
+++ b/lily/music-iterator.cc
@@ -37,94 +37,79 @@
 #include "part-combine-music.hh"
 #include "part-combine-music-iterator.hh"
 #include "request.hh"
-#include "request-iterator.hh"
+#include "simple-music-iterator.hh"
 #include "output-property.hh"
 #include "chord-tremolo-iterator.hh"
 
-void
-Music_iterator::do_print() const
+Music_iterator::Music_iterator ()
 {
+  //  clone_i_ = 0;
 }
 
-void
-Music_iterator::print() const
-{
-#ifndef NPRINT
-  if (!flower_dstream)
-    return ;
-  DEBUG_OUT << classname(this) << "{";
-  Translator_group *t =     report_to_l();
-  DEBUG_OUT << "report to " << t->type_str_ << " = " << t->id_str_ << "\n";
-  if (ok())
-    DEBUG_OUT << "next at " << next_moment() << " ";
-  else
-    DEBUG_OUT << "not feeling well today..";
-  do_print();
-  DEBUG_OUT << "}\n";
-#endif
+Music_iterator::Music_iterator (Music_iterator const& src)
+{
+  //  clone_i_ = src.clone_i_ + 1;
+  handle_ = *src.handle_.clone ();
+  music_l_ = src.music_l_;
 }
 
-Translator_group*
-Music_iterator::get_req_translator_l()
+Music_iterator::~Music_iterator ()
 {
-  assert (report_to_l());
-  if (report_to_l()->is_bottom_translator_b ())
-    return report_to_l();
-
-  set_translator (report_to_l()->get_default_interpreter ());
-  return report_to_l();
 }
 
 
+
+
 Translator_group* 
-Music_iterator::report_to_l() const
+Music_iterator::report_to_l () const
 {
   return handle_.report_to_l ();
 }
 
 
 void
-Music_iterator::set_translator (Translator_group*trans)
+Music_iterator::set_translator (Translator_group *trans)
 {
   handle_.set_translator (trans);
 }
 
 void
-Music_iterator::construct_children()
-{
-}
-
-Music_iterator::~Music_iterator()
+Music_iterator::construct_children ()
 {
 }
 
 Moment
-Music_iterator::next_moment() const
+Music_iterator::pending_moment () const
 {
   return 0;
 }
 
 
 void
-Music_iterator::process_and_next (Moment m)
+Music_iterator::skip (Moment)
 {
-  do_process_and_next (m);
+  assert (0);
 }
 
 void
-Music_iterator::do_process_and_next (Moment)
+Music_iterator::process (Moment)
 {
-  first_b_ = false;
 }
 
 bool
-Music_iterator::ok() const
+Music_iterator::ok () const
+{
+  return false;
+}
+
+SCM
+Music_iterator::get_music (Moment)const
 {
-  return first_b_;
+  return SCM_EOL;
 }
 
 Music_iterator*
-Music_iterator::static_get_iterator_p (Music  *m)
+Music_iterator::static_get_iterator_p (Music *m)
 {
   Music_iterator * p =0;
 
@@ -134,19 +119,19 @@ Music_iterator::static_get_iterator_p (Music  *m)
     p = new Request_chord_iterator;
   else if (dynamic_cast<Lyric_combine_music *> (m))
     p = new Lyric_combine_music_iterator;
-  else if (dynamic_cast<Simultaneous_music   *> (m)) 
+  else if (dynamic_cast<Simultaneous_music *> (m)) 
     p =  new Simultaneous_music_iterator;
-  else if (dynamic_cast<Sequential_music   *> (m)) 
+  else if (dynamic_cast<Sequential_music *> (m)) 
     p =  new Sequential_music_iterator;
-  else if (dynamic_cast<Translation_property   *> (m))
+  else if (dynamic_cast<Translation_property *> (m))
     p = new Property_iterator;
-  else if (dynamic_cast<Change_translator   *> (m))
+  else if (dynamic_cast<Change_translator *> (m))
     p = new Change_iterator;
-  else if (dynamic_cast<Push_translation_property*>(m))
+  else if (dynamic_cast<Push_translation_property*> (m))
     p = new Push_property_iterator;
-  else if (dynamic_cast<Pop_translation_property*>(m))
+  else if (dynamic_cast<Pop_translation_property*> (m))
     p = new Pop_property_iterator;
-  else if (dynamic_cast<Time_scaled_music   *> (m))
+  else if (dynamic_cast<Time_scaled_music *> (m))
     p = new Time_scaled_music_iterator;
   else if (dynamic_cast<Grace_music *> (m))
     p = new Grace_iterator;
@@ -175,10 +160,10 @@ Music_iterator::static_get_iterator_p (Music  *m)
 }
 
 void
-Music_iterator::init_translator (Music  *m, Translator_group  *report_l)
+Music_iterator::init_translator (Music *m, Translator_group *report_l)
 {
   music_l_ = m;
-  if (Context_specced_music  * csm =dynamic_cast<Context_specced_music *>(m))
+  if (Context_specced_music * csm =dynamic_cast<Context_specced_music *> (m))
     {
       Translator_group* a =report_l->
        find_create_translator_l (csm->translator_type_str_, csm->translator_id_str_);
@@ -187,7 +172,7 @@ Music_iterator::init_translator (Music  *m, Translator_group  *report_l)
       
     }
 
-  if (! report_to_l())
+  if (! report_to_l ())
     set_translator (report_l);
 }
 
@@ -196,21 +181,16 @@ Music_iterator*
 Music_iterator::get_iterator_p (Music *m) const
 {
   Music_iterator*p = static_get_iterator_p (m);
-  p->init_translator (m, report_to_l());
+  p->init_translator (m, report_to_l ());
   
-  p->construct_children();
+  p->construct_children ();
   return p;
 }
 
-Music_iterator::Music_iterator()
-{
-  first_b_ = true;
-}
-
 Music_iterator*
-Music_iterator::try_music (Music  *m) const
+Music_iterator::try_music (Music *m) const
 {
-  bool b = report_to_l ()->try_music ((Music*)m); // ugh
+  bool b = report_to_l ()->try_music ( (Music*)m); // ugh
   Music_iterator * it = b ? (Music_iterator*) this : 0;        // ugh
   if (!it)
     it = try_music_in_children (m);
@@ -218,7 +198,7 @@ Music_iterator::try_music (Music  *m) const
 }
 
 Music_iterator*
-Music_iterator::try_music_in_children (Music  *  ) const
+Music_iterator::try_music_in_children (Music *) const
 {
   return 0;
 }