*** empty log message ***

[lilypond.git] / lily / folded-repeat-iterator.cc

diff --git a/lily/folded-repeat-iterator.cc b/lily/folded-repeat-iterator.cc
index 016db26f4059b170b7b671038b8c99f7cab512d6..8ec9103eb9f3cfaf8d3eb2870f7cb23308768cb8 100644 (file)
--- a/lily/folded-repeat-iterator.cc
+++ b/lily/folded-repeat-iterator.cc
@@ -1,23 +1,18 @@
 /*   
-  repeated-music-iterator.cc --  implement Folded_repeat_iterator
+     folded-repeat-iterator.cc --  implement Folded_repeat_iterator
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
-
-/*
-   Folded repeats are a stupid idea at this point, so we refrain from
-   implementing get_pending_events () and skip ().
-*/
-
+#include "input.hh"
 #include "folded-repeat-iterator.hh"
 #include "repeated-music.hh"
 #include "music-list.hh"
 #include "simultaneous-music-iterator.hh"
-#include "translator-group.hh"
+#include "context.hh"
 
 Folded_repeat_iterator::Folded_repeat_iterator ()
 {
@@ -30,19 +25,11 @@ Folded_repeat_iterator::ok () const
 {
   return main_iter_ || alternative_iter_;
 }
-
-Folded_repeat_iterator::~Folded_repeat_iterator ()
-{
-  delete main_iter_;
-  delete alternative_iter_;
-}
-
-Folded_repeat_iterator::Folded_repeat_iterator (Folded_repeat_iterator const &src)
-  : Music_iterator (src)
+void
+Folded_repeat_iterator::do_quit ()
 {
-  main_iter_ = src.main_iter_ ? src.main_iter_->clone () : 0;
-  alternative_iter_ = src.alternative_iter_ ? src.alternative_iter_->clone () : 0;
-  main_length_mom_ = src.main_length_mom_;
+  if (main_iter_)main_iter_->quit ();
+  if (alternative_iter_)alternative_iter_->quit ();
 }
 
 Moment
@@ -60,10 +47,10 @@ void
 Folded_repeat_iterator::construct_children ()
 {
   Repeated_music  *  mus = dynamic_cast<Repeated_music*> (get_music ());
-  main_iter_ = get_iterator (mus->body ());
+  main_iter_ = unsmob_iterator (get_iterator (mus->body ()));
   if (!main_iter_->ok ())
     {
-     leave_body ();
+      leave_body ();
       enter_alternative ();
     }
 }
@@ -95,7 +82,7 @@ Folded_repeat_iterator::process (Moment m)
       alternative_iter_->process (m - main_length_mom_);
       if (!alternative_iter_->ok ())
        {
-         delete alternative_iter_;
+         alternative_iter_->quit ();
          alternative_iter_ =0;
        }
     }
@@ -105,9 +92,10 @@ void
 Folded_repeat_iterator::leave_body ()
 {
   Repeated_music *  mus = dynamic_cast<Repeated_music *> (get_music ());
-  delete main_iter_;
+
+  main_iter_->quit ();
   main_iter_ = 0;
-  main_length_mom_ +=  mus->body ()->length_mom ();
+  main_length_mom_ +=  mus->body ()->get_length ();
 }
 
 void
@@ -116,12 +104,17 @@ Folded_repeat_iterator::enter_alternative ()
   Repeated_music *  mus = dynamic_cast<Repeated_music *> (get_music ());  
   if (mus->alternatives ())
     {
+      /*
+       ugh.
+      */ 
       Simultaneous_music_iterator * s = new Simultaneous_music_iterator;
-      s->separate_contexts_b_ = true;
-      s->init_translator (mus, report_to ());
+      s->create_separate_contexts_ = true;
+      s->init_translator (mus, get_outlet ());
       
       alternative_iter_ = s;
       alternative_iter_->construct_children ();
+
+      scm_gc_unprotect_object (s->self_scm ());
     }
 }
 
@@ -137,5 +130,22 @@ Folded_repeat_iterator::try_music_in_children (Music * m) const
     return alternative_iter_->try_music (m);
   return 0;
 }
+void
+Folded_repeat_iterator::derived_mark ()const
+{
+  if (main_iter_)
+    scm_gc_mark (main_iter_->self_scm ());
+  if (alternative_iter_)
+    scm_gc_mark (alternative_iter_->self_scm ());
+}
+
+void
+Folded_repeat_iterator::derived_substitute (Context *f, Context *t) 
+{
+  if (main_iter_)
+    main_iter_->substitute_outlet (f,t);
+  if (alternative_iter_)
+    alternative_iter_->substitute_outlet (f,t);
+}
 
 IMPLEMENT_CTOR_CALLBACK (Folded_repeat_iterator);