X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fsequential-iterator.cc;h=105126cc75cbdbe43ed753bb84ce4b2cf2c24d08;hb=832c21ee509c9ad488e1490ad59a650e89c8f53a;hp=0658853a122a0d14c86879bed50a3d89db8cffff;hpb=7aabfb20c46e0a1de41698ddc6859ccd3a6dea85;p=lilypond.git diff --git a/lily/sequential-iterator.cc b/lily/sequential-iterator.cc index 0658853a12..105126cc75 100644 --- a/lily/sequential-iterator.cc +++ b/lily/sequential-iterator.cc @@ -3,16 +3,14 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2003 Han-Wen Nienhuys + (c) 1997--2004 Han-Wen Nienhuys */ #include "translator-group.hh" - +#include "context.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 "grace-fixup.hh" /* @@ -25,7 +23,7 @@ Grace_fixup *get_grace_fixups (SCM cursor); 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; @@ -39,10 +37,9 @@ Grace_fixup *get_grace_fixups (SCM cursor); Sequential_iterator::Sequential_iterator () { here_mom_ = Moment (0); - list_ = SCM_EOL; cursor_ = SCM_EOL; grace_fixups_ = 0; - iter_ =0; + iter_ = 0; } SCM @@ -55,55 +52,50 @@ void Sequential_iterator::do_quit () { if (iter_) - iter_->quit(); + 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()); - } -} 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 (Context *f, Context *t) +{ + if (iter_) + 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 (; ly_c_pair_p (cursor); cursor = ly_cdr (cursor)) { - Music * mus = unsmob_music (ly_car (cursor)); + Music *mus = unsmob_music (ly_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_; @@ -115,41 +107,25 @@ get_grace_fixups (SCM cursor) 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; } 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)); } @@ -158,14 +134,15 @@ Sequential_iterator::construct_children () 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 (); + descend_to_child (iter_->get_outlet ()); } @@ -179,18 +156,20 @@ 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_) + 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 (); - Grace_fixup * n =grace_fixups_->next_; - delete grace_fixups_; - grace_fixups_ = n; + last_mom_ = here_mom_; + here_mom_ += gf->length_; + here_mom_.grace_part_ += gf->grace_start_; + + next_grace_fixup (); } else if (len.grace_part_ && !len.main_part_) { + last_mom_ = here_mom_; here_mom_.grace_part_ =0; } else @@ -202,114 +181,30 @@ 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_->quit (); + 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 () -{ -} - - -/* - Retrieve all music (starting at HERE), until a music with length L > - 0 is found. From the precondition, we know that UNTIL is later than - the earliest event. Hence we know - - L >= (UNTIL - HERE) - - so something that comes after this thing with L > 0 happens after - - HERE + L >= HERE + (UNTIL - HERE) = UNTIL - - Hence all events after the one with L>0 are uninteresting, so we - ignore them. - -*/ - -SCM -Sequential_iterator::get_pending_events (Moment until)const -{ - SCM s = SCM_EOL; - if (until < pending_moment ()) - return s; - - Sequential_iterator * me = - dynamic_cast (clone ()); - while (me->ok ()) - { - SCM nm = me->iter_->get_pending_events (until - me->here_mom_); - s = gh_append2 (nm, s); - - Moment m = 0; - for (SCM i = nm; gh_pair_p (i); i = ly_cdr (i)) - { - Music *mus=unsmob_music (ly_car (i)); - m = m >? (mus->get_length () - mus->start_mom ()); - } - if (m > Moment (0)) - break ; - else - me->next_element (false); - } - - scm_gc_unprotect_object (me->self_scm()); - return s; -} - -/* - Skip events till UNTIL. We don't do any other side effects such as - descending to child iterator contexts, because they might depend on - \context specs and \translator changes being executed - */ -void -Sequential_iterator::skip (Moment until) -{ - while (ok ()) - { - if (grace_fixups_ && - grace_fixups_->start_ == here_mom_ - && (grace_fixups_->start_ + grace_fixups_->length_ - + Moment (Rational (0), grace_fixups_->grace_start_) == until)) - { - /* - do the stuff/note/rest preceding a grace. - */ - iter_->skip (iter_->music_get_length ()); - } - else if (iter_->music_get_length () >= until - here_mom_) - iter_->skip (until - here_mom_ + iter_->music_start_mom ()); - - if (iter_->ok ()) - return ; - - next_element (false); - } -} 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. @@ -317,8 +212,11 @@ Sequential_iterator::process (Moment until) 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 @@ -328,7 +226,7 @@ Sequential_iterator::process (Moment until) if (iter_->ok ()) return ; - descend_to_child (); + descend_to_child (iter_->get_outlet ()); next_element (true); } } @@ -341,10 +239,11 @@ 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) + Grace_fixup * gf = get_grace_fixup (); + if (gf + && gf->length_ + iter_->music_start_mom () == cp) { - return here_mom_ + grace_fixups_->length_ + Moment (0, grace_fixups_->grace_start_); + return here_mom_ + gf->length_ + Moment (0, gf->grace_start_); } /* @@ -367,3 +266,26 @@ Sequential_iterator::try_music_in_children (Music *m) const } IMPLEMENT_CTOR_CALLBACK (Sequential_iterator); + +bool +Sequential_iterator::run_always () const +{ + 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; +}