Run `make grand-replace'.

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

diff --git a/lily/simultaneous-music-iterator.cc b/lily/simultaneous-music-iterator.cc
index 764bcdfe8b0a7657ff6986a7f90ff149e92dfa7f..271ae1dc7d59610b4a16ab7be3715fd3b3fd7886 100644 (file)
--- a/lily/simultaneous-music-iterator.cc
+++ b/lily/simultaneous-music-iterator.cc
@@ -1,96 +1,143 @@
 /*
-  Simultaneous_music-iterator.cc -- implement Simultaneous_music_iterator
+  simultaneous-music-iterator.cc -- implement Simultaneous_music_iterator
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-#include "translator-group.hh"
-#include "debug.hh"
 #include "simultaneous-music-iterator.hh"
-
-#include "music-list.hh"
+#include "music.hh"
+#include "context.hh"
+#include "warn.hh"
+#include "context-def.hh"
 
 Simultaneous_music_iterator::Simultaneous_music_iterator ()
 {
+  create_separate_contexts_ = false;
+  children_list_ = SCM_EOL;
 }
 
-Simultaneous_music_iterator::~Simultaneous_music_iterator ()
+void
+Simultaneous_music_iterator::derived_mark () const
 {
+  scm_gc_mark (children_list_);
 }
 
 void
-Simultaneous_music_iterator::construct_children()
+Simultaneous_music_iterator::derived_substitute (Context *f, Context *t)
 {
-  int j = 0;
-  for (PCursor<Music*> i (simultaneous_music_l ()->music_p_list_p_->top());  
-       i.ok(); j++, i++) 
-    {
-      Music_iterator * mi = get_iterator_p (i.ptr());
-      if (mi->ok()) 
-       {
-         if  (simultaneous_music_l ()->translator_type_str_.empty_b ())
-           set_translator (mi->report_to_l()->ancestor_l (0));
-         children_p_list_.bottom().add (mi);
-       }
-      else 
-       delete mi;
-    }
+  for (SCM s = children_list_; scm_is_pair (s); s = scm_cdr (s))
+    unsmob_iterator (scm_car (s))->substitute_outlet (f, t);
 }
 
-
 void
-Simultaneous_music_iterator::do_print() const
+Simultaneous_music_iterator::construct_children ()
 {
-#ifndef NPRINT
-  for (PCursor<Music_iterator*> i (children_p_list_.top()); i.ok (); i++) 
+  int j = 0;
+
+  SCM i = get_music ()->get_property ("elements");
+
+  children_list_ = SCM_EOL;
+  SCM *tail = &children_list_;
+  for (; scm_is_pair (i); i = scm_cdr (i), j++)
     {
-      i->print();
+      Music *mus = unsmob_music (scm_car (i));
+
+      SCM scm_iter = get_static_get_iterator (mus);
+      Music_iterator *mi = unsmob_iterator (scm_iter);
+
+      /* if create_separate_contexts_ is set, create a new context with the
+        number number as name */
+
+      SCM name = ly_symbol2scm (get_outlet ()->context_name ().c_str ());
+      Context *c = (j && create_separate_contexts_)
+       ? get_outlet ()->find_create_context (name, to_string (j), SCM_EOL)
+       : get_outlet ();
+
+      if (!c)
+       c = get_outlet ();
+
+      mi->init_context (mus, c);
+      mi->construct_children ();
+
+      if (mi->ok ())
+       {
+         *tail = scm_cons (scm_iter, *tail);
+         tail = SCM_CDRLOC (*tail);
+       }
+      else
+       mi->quit ();
     }
-#endif
 }
 
 void
-Simultaneous_music_iterator::do_process_and_next (Moment until)
+Simultaneous_music_iterator::process (Moment until)
 {
-  for (PCursor<Music_iterator*> i (children_p_list_.top()); i.ok ();) 
+  SCM *proc = &children_list_;
+  while (scm_is_pair (*proc))
     {
-      if  (i->next_moment() == until) 
+      Music_iterator *i = unsmob_iterator (scm_car (*proc));
+      if (i->run_always ()
+         || i->pending_moment () == until)
+       i->process (until);
+      if (!i->ok ())
        {
-         i->process_and_next (until);
+         i->quit ();
+         *proc = scm_cdr (*proc);
        }
-      if (!i->ok()) 
-       delete i.remove_p();
       else
-       i++;
+       proc = SCM_CDRLOC (*proc);
     }
-  Music_iterator::do_process_and_next (until);
 }
 
-
-
-
 Moment
-Simultaneous_music_iterator::next_moment() const
+Simultaneous_music_iterator::pending_moment () const
 {
   Moment next;
   next.set_infinite (1);
-  for (PCursor<Music_iterator*> i (children_p_list_.top()); i.ok (); i++)
-    next = next <? i->next_moment() ;
+
+  for (SCM s = children_list_; scm_is_pair (s); s = scm_cdr (s))
+    {
+      Music_iterator *it = unsmob_iterator (scm_car (s));
+      next = min (next, it->pending_moment ());
+    }
+
   return next;
 }
 
-
+bool
+Simultaneous_music_iterator::ok () const
+{
+  bool run_always_ok = false;
+  for (SCM s = children_list_; scm_is_pair (s); s = scm_cdr (s))
+    {
+      Music_iterator *it = unsmob_iterator (scm_car (s));
+      if (!it->run_always ())
+       return true;
+      else
+       run_always_ok = run_always_ok || it->ok ();
+    }
+  return run_always_ok;
+}
 
 bool
-Simultaneous_music_iterator::ok() const
+Simultaneous_music_iterator::run_always () const
 {
-  return children_p_list_.size();
+  for (SCM s = children_list_; scm_is_pair (s); s = scm_cdr (s))
+    {
+      Music_iterator *it = unsmob_iterator (scm_car (s));
+      if (it->run_always ())
+       return true;
+    }
+  return false;
 }
 
-Simultaneous_music*
-Simultaneous_music_iterator::simultaneous_music_l ()const
+void
+Simultaneous_music_iterator::do_quit ()
 {
-  return (  Simultaneous_music *) music_l_;
+  for (SCM s = children_list_; scm_is_pair (s); s = scm_cdr (s))
+    unsmob_iterator (scm_car (s))->quit ();
 }
+
+IMPLEMENT_CTOR_CALLBACK (Simultaneous_music_iterator);