* VERSION (MY_PATCH_LEVEL): make 1.7.0

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

diff --git a/lily/music-wrapper-iterator.cc b/lily/music-wrapper-iterator.cc
index 13b2a90c31dacebe3749b245ecba110ff80dbd9b..7798d65eaf001651ccd59417df16d1ed148008e8 100644 (file)
--- a/lily/music-wrapper-iterator.cc
+++ b/lily/music-wrapper-iterator.cc
@@ -1,58 +1,91 @@
 /*   
-  music-wrapper-iterator.cc --  implement 
+  music-wrapper-iterator.cc --  implement Music_wrapper_iterator
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
+  (c) 1998--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
  */
 
 
 #include "music-wrapper-iterator.hh"
 #include "music-wrapper.hh"
 
-Music_wrapper_iterator::Music_wrapper_iterator (Music_wrapper *r)
+Music_wrapper_iterator::Music_wrapper_iterator ()
 {
-  child_iter_p_ =0;
-  music_l_ = r;
+  child_iter_ =0;
 }
 
-IMPLEMENT_IS_TYPE_B1(Music_wrapper_iterator, Music_iterator);
+Music_wrapper_iterator::Music_wrapper_iterator (Music_wrapper_iterator const &src)
+  : Music_iterator (src)
+{
+  child_iter_ = (src.child_iter_) ? src.child_iter_->clone () : 0;
+  if (child_iter_)
+    scm_gc_unprotect_object (child_iter_->self_scm());
+}
 
 void
-Music_wrapper_iterator::do_print () const
+Music_wrapper_iterator::do_quit()
 {
-  child_iter_p_->print ();
+  child_iter_->quit();
 }
 
 void
-Music_wrapper_iterator::construct_children ()
+Music_wrapper_iterator::derived_mark()const
 {
-  child_iter_p_ = get_iterator_p (music_l_->element_p_);  
+  if (child_iter_)
+    scm_gc_mark (child_iter_->self_scm());
 }
 
-Music_wrapper_iterator::~Music_wrapper_iterator ()
+
+void
+Music_wrapper_iterator::construct_children ()
 {
-  delete child_iter_p_;
+  Music * m =  dynamic_cast<Music_wrapper const*> (get_music ())-> element();  
+  child_iter_ = unsmob_iterator (get_iterator (m));
 }
 
-
 bool
 Music_wrapper_iterator::ok () const
 {
-  return child_iter_p_->ok ();
+  return child_iter_ && child_iter_->ok ();
+}
+void
+Music_wrapper_iterator::skip (Moment 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);
 }
 
 void
-Music_wrapper_iterator::process_and_next (Moment m)
+Music_wrapper_iterator::process (Moment m)
 {
-  child_iter_p_->process_and_next (m);
-  Music_iterator::process_and_next (m);
+  child_iter_->process (m);
+}
+
+SCM
+Music_wrapper_iterator::get_pending_events (Moment m)const
+{
+  return child_iter_->get_pending_events (m);
 }
 
 Moment
-Music_wrapper_iterator::next_moment () const
+Music_wrapper_iterator::pending_moment () const
+{
+  return child_iter_->pending_moment ();
+}
+
+Music_iterator*
+Music_wrapper_iterator::try_music_in_children (Music *m) const
 {
-  return child_iter_p_->next_moment ();
+  return child_iter_->try_music (m);
 }
 
+IMPLEMENT_CTOR_CALLBACK (Music_wrapper_iterator);