release: 1.3.88

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

diff --git a/lily/sequential-music-iterator.cc b/lily/sequential-music-iterator.cc
index d99381cf5415a8645039c6251cf44388c58e6575..975f46018739ba7563b7f213e61e33e5485a25c5 100644 (file)
--- a/lily/sequential-music-iterator.cc
+++ b/lily/sequential-music-iterator.cc
@@ -12,14 +12,6 @@
 #include "music-list.hh"
 #include "request-chord-iterator.hh"
 
-
-void
-Sequential_music_iterator::do_print() const
-{
-  if (iter_p_)
-    iter_p_->print();
-}
-
 Sequential_music_iterator::Sequential_music_iterator ()
 {
   cursor_ = 0;
@@ -27,6 +19,27 @@ Sequential_music_iterator::Sequential_music_iterator ()
   iter_p_ =0;
 }
 
+Sequential_music_iterator::Sequential_music_iterator (Sequential_music_iterator const &src)
+  : Music_iterator (src)
+{
+  cursor_ = src.cursor_;
+  here_mom_ = src.here_mom_;
+  iter_p_ = src.iter_p_->clone ();
+}
+
+Sequential_music_iterator::~Sequential_music_iterator()
+{
+  if (iter_p_)
+    {
+      /*      if (iter_p_->ok () )
+       music_l_->origin ()->warning (_ ("Must stop before this music ends"));
+      */
+      delete iter_p_;
+      iter_p_ = 0;
+    }
+}
+
+
 void
 Sequential_music_iterator::construct_children()
 {
@@ -75,56 +88,92 @@ Sequential_music_iterator::set_sequential_music_translator()
     set_translator (child_report);
 }
 
-Sequential_music_iterator::~Sequential_music_iterator()
+/*
+  [todo: translate]
+  
+  Hier staat in feite: haal alle muziek op (startend op tijd HERE) tot
+  je iets met lengte L > 0 tegenkomt.  Aangezien de preconditie is dat
+  UNTIL het eerstvolgende event is, weet je (per definitie)
+
+  L >= (UNTIL - HERE)
+
+  en iets wat hierna komt (op tijd T) komt dus na tijd
+
+  HERE + L >= HERE + (UNTIL - HERE) = UNTIL
+
+  Dus als je een L>0 tegenkomt, wil je de rest niet meer. Aangezien
+  alles wat tot nu toe hebt gespaard op HERE begint, is dat precies wat
+  je nodig hebt.
+
+  Misschien kan je deze comment erbij stoppen, en moeten we de
+  eigenschappen van het muziek datatype wat formaliseren, zodat deze
+  redenering helderder is.
+*/
+
+SCM
+Sequential_music_iterator::get_music (Moment until)const
 {
-  if (iter_p_)
+  SCM s = SCM_EOL;
+  SCM curs = cursor_;
+  Music_iterator * iter = iter_p_->clone ();
+  while (1)
     {
-      if (iter_p_->ok ())
-       music_l_->origin ()->warning (_ ("Must stop before this music ends"));
-      delete iter_p_;
-      iter_p_ = 0;
+      SCM nm = iter->get_music (until - here_mom_);
+      s = gh_append2 (nm, s);
+      
+      Moment m = 0;
+      for (SCM i = nm; gh_pair_p(i); i = gh_cdr (i))
+       m = m >? unsmob_music (gh_car (i))->length_mom ();
+
+      delete iter;
+
+      curs = gh_cdr (curs);
+
+      if (!gh_pair_p (curs) ||  m > Moment (0))
+       return s;
+      else
+       {
+         iter = get_iterator_p (unsmob_music (gh_car (curs)));
+       }      
     }
+  return s;
 }
-
+ 
 void
-Sequential_music_iterator::do_process_and_next (Moment until)
+Sequential_music_iterator::process (Moment until)
 {
-  if (!iter_p_)
-    return;
-
-  while (1) 
+  if (ok ())
     {
-      Moment local_until = until - here_mom_;
-      while (iter_p_->ok()) 
-       {
-         Moment here = iter_p_->next_moment();
-         if (here != local_until)
-           goto loopexit;
-           
-         iter_p_->process_and_next (local_until);
-       }
-      
-      if (!iter_p_->ok()) 
+      while (1) 
        {
-         set_sequential_music_translator();
-         leave_element();
+         Moment local_until = until - here_mom_;
+         while (iter_p_->ok ()) 
+           {
+             Moment here = iter_p_->pending_moment ();
+             if (here != local_until)
+               return ;
+             
+             iter_p_->process (local_until);
+           }
          
-         if (gh_pair_p (cursor_))
-           start_next_element();
-         else 
-           goto loopexit;
+         if (!iter_p_->ok ()) 
+           {
+             set_sequential_music_translator ();
+             leave_element ();
+             
+             if (gh_pair_p (cursor_))
+               start_next_element ();
+             else 
+               return ;
+           }
        }
     }
-
-loopexit:
-
-  Music_iterator::do_process_and_next (until);
 }
 
 Moment
-Sequential_music_iterator::next_moment() const
+Sequential_music_iterator::pending_moment() const
 {
-  return iter_p_->next_moment() + here_mom_;
+  return iter_p_->pending_moment() + here_mom_;
 }