X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fsequential-iterator.cc;h=308be34d0c1c46d2a3e787595c17509b8413efb4;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=2b41b1e016540f37e22cf11fc948449c060dae6c;hpb=e58fce49b3113408254011774685370b8233df17;p=lilypond.git diff --git a/lily/sequential-iterator.cc b/lily/sequential-iterator.cc index 2b41b1e016..308be34d0c 100644 --- a/lily/sequential-iterator.cc +++ b/lily/sequential-iterator.cc @@ -1,149 +1,116 @@ /* - Sequential_iterator.cc -- implement Sequential_iterator + sequential-iterator.cc -- implement Sequential_iterator source file of the GNU LilyPond music typesetter - (c) 1997--2003 Han-Wen Nienhuys + (c) 1997--2008 Han-Wen Nienhuys */ -#include "translator-group.hh" - #include "sequential-iterator.hh" -#include "music-list.hh" - -Grace_fixup *copy_grace_fixups (Grace_fixup* src); -Grace_fixup *get_grace_fixups (SCM cursor); +#include "music.hh" +#include "translator-group.hh" +#include "context.hh" +#include "grace-fixup.hh" /* - TODO: handling of grace notes is exquisite pain. This handling should be formally specified and then the implementation verified. - */ /* Invariant for the data structure. - if (gh_pair_p (cursor_)) - iter_->music_ == unsmob_music (ly_car (cursor_)) + if (scm_is_pair (cursor_)) + iter_->music_ == unsmob_music (scm_car (cursor_)) else - iter_ == 0; + iter_ == 0; The length of musiclist from start to up to cursor_ (cursor_ not including), is summed - here_mom_ = sum (length (musiclist [start ... cursor>)) %) - - */ + here_mom_ = sum (length (musiclist [start ... cursor>)) %) +*/ Sequential_iterator::Sequential_iterator () { here_mom_ = Moment (0); - list_ = SCM_EOL; - cursor_ = SCM_EOL; + cursor_ = SCM_EOL; grace_fixups_ = 0; - iter_ =0; + iter_ = 0; } -SCM +SCM Sequential_iterator::get_music_list () const { - return SCM_EOL; + Music *m = get_music (); + SCM proc = m->get_property ("elements-callback"); + if (scm_procedure_p (proc)) + return scm_call_1 (proc, m->self_scm ()); + else + return SCM_EOL; } void Sequential_iterator::do_quit () { if (iter_) - iter_->quit(); -} - - -Sequential_iterator::Sequential_iterator (Sequential_iterator const &src) - : Music_iterator (src) -{ - grace_fixups_ = copy_grace_fixups (src.grace_fixups_); - cursor_ = src.cursor_; - list_ = src.cursor_; - here_mom_ = src.here_mom_; - iter_ = 0; - - if (src.iter_) - { - iter_ = src.iter_->clone (); - scm_gc_unprotect_object (iter_->self_scm()); - } + iter_->quit (); } 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 (iter_->self_scm ()); scm_gc_mark (cursor_); } - void -Sequential_iterator::derived_substitute (Translator_group*f,Translator_group*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 * -get_grace_fixups (SCM cursor) +create_grace_fixup_list (SCM cursor) { Moment here; Moment last (-1); Grace_fixup *head = 0; Grace_fixup **tail = &head; - for (; gh_pair_p (cursor); cursor = ly_cdr (cursor)) + for (; scm_is_pair (cursor); cursor = scm_cdr (cursor)) { - Music * mus = unsmob_music (ly_car (cursor)); + Music *mus = unsmob_music (scm_car (cursor)); Moment s = mus->start_mom (); - Moment l =mus->get_length () - s; + Moment l = mus->get_length () - s; if (s.grace_part_) { if (last != Moment (-1)) { - Grace_fixup *p =new Grace_fixup; + Grace_fixup *p = new Grace_fixup; p->start_ = last; p->length_ = here - last; p->grace_start_ = s.grace_part_; p->next_ = 0; *tail = p; - tail = &(*tail)->next_; + tail = &(*tail)->next_; } here.grace_part_ = s.grace_part_; } - - if (l.to_bool()) + + if (l.to_bool ()) { last = here; here += l; } } - return head; -} - -Grace_fixup * -copy_grace_fixups (Grace_fixup* src) -{ - Grace_fixup * head = 0; - Grace_fixup **dest = &head; - - while (src) - { - *dest = new Grace_fixup (*src); - dest = & (*dest)->next_; - src = src ->next_; - } return head; } @@ -151,32 +118,29 @@ copy_grace_fixups (Grace_fixup* src) void Sequential_iterator::construct_children () { - list_ = get_music_list (); - cursor_ = list_; + cursor_ = get_music_list (); iter_ = 0; - if (gh_pair_p (cursor_)) + if (scm_is_pair (cursor_)) { - Music *m =unsmob_music (ly_car (cursor_)); + Music *m = unsmob_music (scm_car (cursor_)); iter_ = unsmob_iterator (get_iterator (m)); } - + while (iter_ && !iter_->ok ()) - { - next_element (true); - } + next_element (true); + last_mom_ = Moment (-1); here_mom_ = get_music ()->start_mom (); - grace_fixups_ = get_grace_fixups (cursor_); + grace_fixups_ = create_grace_fixup_list (cursor_); /* iter_->ok () is tautology, but what the heck. - */ - if (iter_ && iter_->ok ()) - descend_to_child (); + */ + if (iter_ && iter_->ok ()) + descend_to_child (iter_->get_outlet ()); } - /* maintain invariants: change cursor, iter and here_mom_ in one fell swoop. @@ -184,22 +148,24 @@ Sequential_iterator::construct_children () void Sequential_iterator::next_element (bool) { - Moment len =iter_->music_get_length () - iter_->music_start_mom (); - assert (!grace_fixups_ || grace_fixups_->start_ >= here_mom_); - - if (len.main_part_ && grace_fixups_ && - grace_fixups_->start_ == here_mom_) + Moment len = iter_->music_get_length () - iter_->music_start_mom (); + assert (!grace_fixups_ || grace_fixups_->start_ >= here_mom_); + + if (len.main_part_ + && get_grace_fixup ()) { - here_mom_ += grace_fixups_->length_; - here_mom_.grace_part_ += grace_fixups_->grace_start_; + Grace_fixup *gf = get_grace_fixup (); + + last_mom_ = here_mom_; + here_mom_ += gf->length_; + here_mom_.grace_part_ += gf->grace_start_; - Grace_fixup * n =grace_fixups_->next_; - delete grace_fixups_; - grace_fixups_ = n; + next_grace_fixup (); } else if (len.grace_part_ && !len.main_part_) { - here_mom_.grace_part_ =0; + last_mom_ = here_mom_; + here_mom_.grace_part_ = 0; } else { @@ -210,68 +176,50 @@ Sequential_iterator::next_element (bool) 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_)) - iter_ = unsmob_iterator (get_iterator (unsmob_music (ly_car (cursor_)))); + cursor_ = scm_cdr (cursor_); + + iter_->quit (); + if (scm_is_pair (cursor_)) + iter_ = unsmob_iterator (get_iterator (unsmob_music (scm_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 () -{ - Translator_group * child_report = child_report = iter_->get_outlet (); - Translator_group * me_report = get_outlet (); - - Translator_group * c = child_report; - while (c && c != me_report) - { - c= c->daddy_trans_; - } - - if (c == me_report) - set_translator (child_report); -} - - - void Sequential_iterator::process (Moment until) { while (iter_) { - if (grace_fixups_ && - grace_fixups_->start_ == here_mom_ - && (grace_fixups_->start_ + grace_fixups_->length_ - + Moment (Rational (0), grace_fixups_->grace_start_) == until)) + Grace_fixup *gf = get_grace_fixup (); + if (gf + && gf->start_ + gf->length_ + + Moment (Rational (0), gf->grace_start_) == until) { /* do the stuff/note/rest preceding a grace. - */ + */ iter_->process (iter_->music_get_length ()); } else - iter_->process (until - here_mom_ + iter_->music_start_mom ()); + { + Moment w = until - here_mom_ + iter_->music_start_mom (); + iter_->process (w); + } /* if the iter is still OK, there must be events left that have - - TIME > LEFT - + + TIME > LEFT + */ if (iter_->ok ()) - return ; + return; - descend_to_child (); + descend_to_child (iter_->get_outlet ()); next_element (true); } } @@ -284,11 +232,10 @@ Sequential_iterator::pending_moment () const /* Fix-up a grace note halfway in the music. */ - if (grace_fixups_ && here_mom_ == grace_fixups_->start_ - && grace_fixups_->length_ + iter_->music_start_mom () == cp) - { - return here_mom_ + grace_fixups_->length_ + Moment (0, grace_fixups_->grace_start_); - } + Grace_fixup *gf = get_grace_fixup (); + if (gf + && gf->length_ + iter_->music_start_mom () == cp) + return here_mom_ + gf->length_ + Moment (0, gf->grace_start_); /* Fix-up a grace note at the start of the music. @@ -296,23 +243,33 @@ Sequential_iterator::pending_moment () const return cp + here_mom_ - iter_->music_start_mom (); } - bool Sequential_iterator::ok () const { return iter_; } -Music_iterator* -Sequential_iterator::try_music_in_children (Music *m) const -{ - return iter_ ? iter_->try_music (m) : 0; -} - IMPLEMENT_CTOR_CALLBACK (Sequential_iterator); bool Sequential_iterator::run_always () const { - return iter_ ? iter_->run_always () : false; + return iter_ ? iter_->run_always () : false; +} + +void +Sequential_iterator::next_grace_fixup () +{ + Grace_fixup *n = grace_fixups_->next_; + delete grace_fixups_; + grace_fixups_ = n; +} + +Grace_fixup * +Sequential_iterator::get_grace_fixup () const +{ + if (grace_fixups_ && grace_fixups_->start_ == here_mom_) + return grace_fixups_; + else + return 0; }