Invariant for the data structure.
- if (gh_pair_p (cursor_))
+ if (ly_c_pair_p (cursor_))
iter_->music_ == unsmob_music (ly_car (cursor_))
else
iter_ == 0;
Grace_fixup *head = 0;
Grace_fixup **tail = &head;
- for (; gh_pair_p (cursor); cursor = ly_cdr (cursor))
+ for (; ly_c_pair_p (cursor); cursor = ly_cdr (cursor))
{
Music *mus = unsmob_music (ly_car (cursor));
Moment s = mus->start_mom ();
cursor_ = get_music_list ();
iter_ = 0;
- if (gh_pair_p (cursor_))
+ if (ly_c_pair_p (cursor_))
{
Music *m = unsmob_music (ly_car (cursor_));
iter_ = unsmob_iterator (get_iterator (m));
iter_->ok () is tautology, but what the heck.
*/
if (iter_ && iter_->ok ())
- descend_to_child ();
+ descend_to_child (iter_->get_outlet ());
}
cursor_ = ly_cdr (cursor_);
iter_->quit ();
- if (gh_pair_p (cursor_))
+ if (ly_c_pair_p (cursor_))
iter_ = unsmob_iterator (get_iterator (unsmob_music (ly_car (cursor_))));
else
iter_ = 0;
}
-/*
- move to context of child iterator if it is deeper down in the
- hierarchy.
- */
-void
-Sequential_iterator::descend_to_child ()
-{
- Context * child_report = child_report = iter_->get_outlet ();
- Context * me_report = get_outlet ();
- Context * c = child_report;
- while (c && c != me_report)
- {
- c = c->daddy_context_;
- }
-
- if (c == me_report)
- set_translator (child_report);
-}
void
Sequential_iterator::process (Moment until)
if (iter_->ok ())
return ;
- descend_to_child ();
+ descend_to_child (iter_->get_outlet ());
next_element (true);
}
}