/*
- 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--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
{
return main_iter_ || alternative_iter_;
}
-
-Folded_repeat_iterator::~Folded_repeat_iterator ()
+void
+Folded_repeat_iterator::do_quit()
{
- delete main_iter_;
- delete alternative_iter_;
+ if (main_iter_)main_iter_->quit();
+ if (alternative_iter_)alternative_iter_->quit();
}
Folded_repeat_iterator::Folded_repeat_iterator (Folded_repeat_iterator const &src)
: Music_iterator (src)
{
- main_iter_ = src.main_iter_ ? src.main_iter_->clone () : 0;
- alternative_iter_ = src.alternative_iter_ ? src.alternative_iter_->clone () : 0;
+ main_iter_ = 0;
+ alternative_iter_ = 0;
main_length_mom_ = src.main_length_mom_;
+
+ if (src.alternative_iter_)
+ alternative_iter_ = src.alternative_iter_->clone ();
+ if (src.main_iter_)
+ main_iter_ = src.main_iter_->clone ();
+
+ if (main_iter_)
+ scm_gc_unprotect_object (main_iter_->self_scm());
+ if (alternative_iter_)
+ scm_gc_unprotect_object (alternative_iter_->self_scm());
}
Moment
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 ();
}
}
alternative_iter_->process (m - main_length_mom_);
if (!alternative_iter_->ok ())
{
- delete alternative_iter_;
+ alternative_iter_->quit();
alternative_iter_ =0;
}
}
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
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 ());
alternative_iter_ = s;
alternative_iter_->construct_children ();
+
+ scm_gc_unprotect_object (s->self_scm());
}
}
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 (Translator_group*f, Translator_group*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);