``slikken kreng''

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

diff --git a/lily/music-wrapper-iterator.cc b/lily/music-wrapper-iterator.cc
index 43fe4b495c97ada4d73d6b5bcc9c98c787588294..4980c9344ff0322ba5249a3bae641bf8431d074c 100644 (file)
--- a/lily/music-wrapper-iterator.cc
+++ b/lily/music-wrapper-iterator.cc
@@ -3,8 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
+  (c) 1998--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
  */
 
 
@@ -13,64 +12,73 @@
 
 Music_wrapper_iterator::Music_wrapper_iterator ()
 {
-  child_iter_p_ =0;
+  child_iter_ =0;
 }
 
-
-
-void
-Music_wrapper_iterator::do_print () const
+Music_wrapper_iterator::Music_wrapper_iterator (Music_wrapper_iterator const &src)
+  : Music_iterator (src)
 {
-  child_iter_p_->print ();
+  if (src.child_iter_)
+    child_iter_ = src.child_iter_->clone ();
+  else
+    child_iter_ = 0;
 }
 
-void
-Music_wrapper_iterator::construct_children ()
+Music_wrapper_iterator::~Music_wrapper_iterator ()
 {
-  child_iter_p_ =
-    get_iterator_p (dynamic_cast<Music_wrapper const*> (music_l_)->element ());
+  delete child_iter_;
 }
 
-Music_wrapper_iterator::~Music_wrapper_iterator ()
+
+void
+Music_wrapper_iterator::construct_children ()
 {
-  delete child_iter_p_;
+  child_iter_ =
+    get_iterator (dynamic_cast<Music_wrapper const*> (get_music ())->element ());
 }
 
-
 bool
 Music_wrapper_iterator::ok () const
 {
-  return child_iter_p_ && child_iter_p_->ok ();
+  return child_iter_ && child_iter_->ok ();
 }
-
 void
-Music_wrapper_iterator::do_process_and_next (Moment m)
+Music_wrapper_iterator::skip (Moment m)
 {
-  child_iter_p_->process_and_next (m);
-  Music_iterator::do_process_and_next (m);
+  /*
+    FIXME: should make sure that the initial try_music () is skipped as
+    well, if you would do
+
+    iter = get_iterator (Side_effect_music); // eg. property setting
+    iter->skip (1/2)
+    iter->process ()
+
+  */
+  child_iter_->skip (m);
 }
 
-Music*
-Music_wrapper_iterator::get_music ()
+void
+Music_wrapper_iterator::process (Moment m)
 {
-  return child_iter_p_->get_music ();
+  child_iter_->process (m);
 }
 
-bool
-Music_wrapper_iterator::next ()
+SCM
+Music_wrapper_iterator::get_pending_events (Moment m)const
 {
-  return child_iter_p_->next ();
+  return child_iter_->get_pending_events (m);
 }
 
 Moment
-Music_wrapper_iterator::next_moment () const
+Music_wrapper_iterator::pending_moment () const
 {
-  return child_iter_p_->next_moment ();
+  return child_iter_->pending_moment ();
 }
 
-
 Music_iterator*
 Music_wrapper_iterator::try_music_in_children (Music *m) const
 {
-  return child_iter_p_->try_music (m);
+  return child_iter_->try_music (m);
 }
+
+IMPLEMENT_CTOR_CALLBACK (Music_wrapper_iterator);