#include "context.hh"
#include "sequential-iterator.hh"
#include "music-list.hh"
-
-Grace_fixup *get_grace_fixups (SCM cursor);
+#include "grace-fixup.hh"
/*
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;
Sequential_iterator::Sequential_iterator ()
{
here_mom_ = Moment (0);
- list_ = SCM_EOL;
cursor_ = SCM_EOL;
grace_fixups_ = 0;
iter_ = 0;
void
-Sequential_iterator::derived_mark ()const
+Sequential_iterator::derived_mark () const
{
if (iter_)
scm_gc_mark (iter_->self_scm ());
- scm_gc_mark (list_);
scm_gc_mark (cursor_);
}
void
-Sequential_iterator::derived_substitute (Context *f,Context *t)
+Sequential_iterator::derived_substitute (Context *f, Context *t)
{
if (iter_)
- iter_->substitute_outlet (f,t);
-
+ iter_->substitute_outlet (f, t);
}
+/*
+ TODO: this should be made lazily.
+ */
Grace_fixup *
create_grace_fixup_list (SCM cursor)
{
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 ();
void
Sequential_iterator::construct_children ()
{
- list_ = get_music_list ();
- cursor_ = list_;
+ cursor_ = get_music_list ();
iter_ = 0;
- if (gh_pair_p (cursor_))
+ if (ly_c_pair_p (cursor_))
{
- Music *m =unsmob_music (ly_car (cursor_));
+ Music *m = unsmob_music (ly_car (cursor_));
iter_ = unsmob_iterator (get_iterator (m));
}
next_element (true);
}
+ last_mom_ = Moment (-1);
here_mom_ = get_music ()->start_mom ();
grace_fixups_ = create_grace_fixup_list (cursor_);
iter_->ok () is tautology, but what the heck.
*/
if (iter_ && iter_->ok ())
- descend_to_child ();
+ descend_to_child (iter_->get_outlet ());
}
&& get_grace_fixup ())
{
Grace_fixup *gf = get_grace_fixup ();
-
+
+ last_mom_ = here_mom_;
here_mom_ += gf->length_;
here_mom_.grace_part_ += gf->grace_start_;
}
else if (len.grace_part_ && !len.main_part_)
{
+ last_mom_ = here_mom_;
here_mom_.grace_part_ =0;
}
else
in that chunk should be in len.grace_part_
*/
+ last_mom_ = here_mom_;;
here_mom_ += len;
}
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
if (iter_->ok ())
return ;
- descend_to_child ();
+ descend_to_child (iter_->get_outlet ());
next_element (true);
}
}
grace_fixups_ = n;
}
-
Grace_fixup*
Sequential_iterator::get_grace_fixup () const
{