X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fmusic-iterator.cc;h=c880e9bf961f72b66540ffb87e9575e7a19182ce;hb=5d04488bc3a94ee9c84c075874831e31f6a888d2;hp=99b942b91ea2eaeed4c6f39b5b4d3b6863a42c21;hpb=6dc4e4d14a67f65f337ec1a06466e748c68dcad5;p=lilypond.git diff --git a/lily/music-iterator.cc b/lily/music-iterator.cc index 99b942b91e..c880e9bf96 100644 --- a/lily/music-iterator.cc +++ b/lily/music-iterator.cc @@ -1,401 +1,227 @@ /* - music-iterator.cc -- implement {Music,Chord,Voice}_iterator + music-iterator.cc -- implement Music_iterator source file of the GNU LilyPond music typesetter - (c) 1997 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ -#include "music-list.hh" +/* + UGH. too many includes. + */ +#include "warn.hh" #include "music-iterator.hh" -#include "translator.hh" -#include "request.hh" -#include "debug.hh" - +#include "translator-group.hh" +#include "music-wrapper.hh" +#include "music-wrapper-iterator.hh" +#include "simple-music-iterator.hh" +#include "ly-smobs.icc" -IMPLEMENT_IS_TYPE_B(Music_iterator); - -Chord_iterator::~Chord_iterator() -{ -} +#include "ly-smobs.icc" -void -Music_iterator::do_print()const +Music_iterator::Music_iterator () { - + music_ = 0; + smobify_self (); } -void -Music_iterator::print() const +Music_iterator::Music_iterator (Music_iterator const& src) { -#ifndef NPRINT - mtor << name() << "{"; - mtor << "report to " << - report_to_l() << " (" << report_to_l()->name() << ")\n"; - mtor << "next at " << next_moment() << " "; - do_print(); - mtor << "}\n"; -#endif + handle_ = *src.handle_.clone (); + music_ = src.music_; + music_length_ = src.music_length_; + start_mom_ = src.start_mom_; + smobify_self (); } -Translator * -Music_iterator::get_req_translator_l() +Music_iterator::~Music_iterator () { - assert(report_to_l()); - if (report_to_l()->is_bottom_engraver_b() ) - return report_to_l(); - - set_translator( report_to_l()->get_default_interpreter() ); - return report_to_l(); } -void -Music_iterator::push_translator(Translator*t) +Translator_group* +Music_iterator::report_to () const { - if (t) { - report_to_l_arr_.push(t); - t->iterator_count_ ++; - } + return handle_.report_to (); } void -Music_iterator::pop_translator() +Music_iterator::set_translator (Translator_group *trans) { - if (report_to_l()) { - report_to_l()->iterator_count_ --; - report_to_l_arr_.pop(); - } -} - -Translator* -Music_iterator::report_to_l()const -{ - if (! report_to_l_arr_.size() ) - return 0; - return report_to_l_arr_.top(); -} - - -void -Music_iterator::set_translator(Translator*reg) -{ - if (report_to_l()==reg) - return; - pop_translator(); - push_translator(reg); + handle_.set_translator (trans); } void -Music_iterator::construct_children() -{ - -} - -Music_iterator::~Music_iterator() +Music_iterator::construct_children () { - set_translator(0); } Moment -Music_iterator::next_moment()const +Music_iterator::pending_moment () const { - return 0; + return 0; } void -Music_iterator::process_and_next(Moment) +Music_iterator::process (Moment) { - first_b_ = false; } bool -Music_iterator::ok()const +Music_iterator::ok () const { - return first_b_; + return false; } -Music_iterator* -Music_iterator::static_get_iterator_p(Music *m, - Translator *report_l) -{ - Music_iterator * p =0; - if (m->is_type_b( Change_reg::static_name())) - p = new Change_iterator((Change_reg*)m); - else if (m->is_type_b( Request_chord::static_name())) - p = new Request_chord_iterator( (Request_chord*) m); - else if (m->is_type_b( Chord::static_name())) - p = new Chord_iterator( (Chord*) m); - else if (m->is_type_b( Voice::static_name())) - p = new Voice_iterator( (Voice*) m); - - if ( m->is_type_b( Music_list::static_name())) { - Music_list* ml = (Music_list*) m; - if (ml -> type_str_ != "") { - Translator * a =report_l-> - find_get_translator_l(ml-> type_str_, ml->id_str_); - - - p->set_translator( a); - - } - } - if (! p->report_to_l() ) - p ->set_translator(report_l); - - return p; -} - -Music_iterator* -Music_iterator::get_iterator_p(Music*m)const +void +Music_iterator::skip (Moment) { - Music_iterator*p = static_get_iterator_p(m,report_to_l()); - p->daddy_iter_l_ = (Music_iterator*)this; - p->construct_children(); - return p; } -Music_iterator::Music_iterator() +SCM +Music_iterator::get_pending_events (Moment)const { - daddy_iter_l_ =0; - first_b_ = true; + return SCM_EOL; } -/* ************** */ - -Chord_iterator::Chord_iterator(Chord const *chord_C) +SCM +Music_iterator::get_static_get_iterator (Music *m) { - chord_C_ = chord_C; -} + Music_iterator * p =0; -void -Chord_iterator::construct_children() -{ - int j = 0; - for(PCursor i(chord_C_->music_p_list_.top()); //, int j = 0; - i.ok(); j++, i++) { - Music_iterator * mi = get_iterator_p( i.ptr()); - set_translator(mi->report_to_l()->ancestor_l( chord_C_->multi_level_i_ )); - if ( mi->ok() ) - children_p_list_.bottom().add( mi ); - else - delete mi; - } -} -void -Chord_iterator::do_print() const -{ -#ifndef NPRINT - for (PCursor i(children_p_list_.top()); i.ok(); i++) { - i->print(); + SCM ctor = m->get_mus_property ("iterator-ctor") ; + SCM iter = SCM_EOL; + if (gh_procedure_p (ctor)) + { + iter = gh_call0 (ctor); + p = unsmob_iterator (iter); } -#endif -} - -void -Chord_iterator::process_and_next(Moment until) -{ - for (PCursor i(children_p_list_.top()); i.ok(); ) { - if (i->next_moment() == until) { - i->process_and_next(until); - } - if (!i->ok()) - delete i.remove_p(); - else - i++; + else + { + if (dynamic_cast (m)) + p = new Music_wrapper_iterator; + else + p = new Simple_music_iterator; + + iter = p->self_scm(); + scm_gc_unprotect_object (iter); } - Music_iterator::process_and_next(until); -// assert(!ok() || next_moment() > until); + p->music_ = m; + assert (m); + p->music_length_ = m->get_length (); + p->start_mom_ = m->start_mom (); + return iter; } -IMPLEMENT_IS_TYPE_B1(Chord_iterator,Music_iterator); - Moment -Chord_iterator::next_moment()const +Music_iterator::music_get_length () const { - Moment next_ = INFTY; - for (PCursor i(children_p_list_.top()); i.ok(); i++) - next_ = next_ next_moment() ; - return next_; + return music_length_; } - - -bool -Chord_iterator::ok()const -{ - return children_p_list_.size(); -} - -/* ************** */ - -void -Voice_iterator::do_print()const -{ - if (iter_p_) - iter_p_->print(); -} - -Voice_iterator::Voice_iterator(Voice const*v) - : PCursor ( v->music_p_list_) -{ - here_mom_ = v->offset_mom_; - voice_C_ = v; - iter_p_ =0; -} - -void -Voice_iterator::construct_children() +Moment +Music_iterator::music_start_mom ()const { - if (ok()) { - iter_p_ = Music_iterator::get_iterator_p( ptr() ); - if (iter_p_->report_to_l()->depth_i() > report_to_l()->depth_i()) - set_translator(iter_p_->report_to_l()); - } + return start_mom_; } void -Voice_iterator::next_element() +Music_iterator::init_translator (Music *m, Translator_group *report) { - delete iter_p_ ; - iter_p_ =0; - here_mom_ += ptr()->time_int().length(); - PCursor::next(); - construct_children(); -} - -Voice_iterator::~Voice_iterator() -{ - delete iter_p_; + music_ = m; + assert (m); + if (! report_to ()) + set_translator (report); } -IMPLEMENT_IS_TYPE_B1(Voice_iterator,Music_iterator); - -void -Voice_iterator::process_and_next(Moment until) +SCM +Music_iterator::get_iterator (Music *m) const { - while (ok()) { - Moment local_until = until - here_mom_; - while ( iter_p_ && iter_p_->ok() ) { - Moment here = iter_p_->next_moment(); - if (here != local_until) - return; - iter_p_->process_and_next(local_until); - } - if (!iter_p_) - iter_p_ = Music_iterator::get_iterator_p( ptr() ); - else if (!iter_p_->ok() ) - next_element(); - } - Music_iterator::process_and_next(until); - assert(!ok() || next_moment() > until); + SCM ip = get_static_get_iterator (m); + Music_iterator*p = unsmob_iterator (ip); + + p->init_translator (m, report_to ()); + + p->construct_children (); + return ip; } -Moment -Voice_iterator::next_moment()const +/* + TODO: rename to prevent confusion between Translator::try_music and + Iterator::try_music + + */ +Music_iterator* +Music_iterator::try_music (Music *m) const { - return iter_p_->next_moment() + here_mom_; + bool b = report_to ()->try_music ((Music*)m); // ugh + Music_iterator * it = b ? (Music_iterator*) this : 0; // ugh + if (!it) + it = try_music_in_children (m); + return it; } -bool -Voice_iterator::ok()const +Music_iterator* +Music_iterator::try_music_in_children (Music *) const { - return PCursor::ok(); + return 0; } -/* ***************** */ +IMPLEMENT_CTOR_CALLBACK (Music_iterator); - -Change_iterator::Change_iterator(Change_reg * ch) +Music * +Music_iterator::get_music () const { - change_l_ = ch; + return music_; } +/****************************************************************/ -IMPLEMENT_IS_TYPE_B1(Change_iterator,Music_iterator); +IMPLEMENT_TYPE_P (Music_iterator, "ly-iterator?"); +IMPLEMENT_SMOBS(Music_iterator); +IMPLEMENT_DEFAULT_EQUAL_P(Music_iterator); -/* - TODO: pop/pushgroup - */ -void -Change_iterator::process_and_next(Moment mom) +SCM +Music_iterator::mark_smob (SCM smob) { -#if 0 - if ( id[0] == '-') { - - - Engraver_group_engraver *group_l = - report_to_l()->find_get_translator_l(change_l_->type_str_, - change_l_->id_str_); - - report_to_l()->daddy_grav_l_->remove_engraver_p(report_to_l()); - group_l->add(report_to_l()); -#endif - Music_iterator::process_and_next(mom); -} - + Music_iterator * mus = (Music_iterator *)SCM_CELL_WORD_1 (smob); + mus->derived_mark (); + /* + Careful with GC, although we intend the following as pointers + only, we _must_ mark them. + */ + if (mus->report_to()) + scm_gc_mark (mus->report_to()->self_scm()); + if (mus->music_) + scm_gc_mark (mus->music_->self_scm()); + -/* ******************** */ - - -IMPLEMENT_IS_TYPE_B1(Request_chord_iterator,Music_iterator); - -void -Request_chord_iterator::construct_children() -{ - get_req_translator_l(); + return SCM_EOL; } -Request_chord_iterator::Request_chord_iterator(Request_chord*el_l) +int +Music_iterator::print_smob (SCM , SCM port, scm_print_state*) { - elt_l_ = el_l; - elt_duration_ = el_l->time_int().length(); - last_b_ = false; + scm_puts ("#", port); + return 1; } - -bool -Request_chord_iterator::ok()const -{ - return (elt_duration_ && !last_b_) || first_b_; -} - - - -Moment -Request_chord_iterator::next_moment()const +void +Music_iterator::derived_mark()const { - Moment m(0); - if (!first_b_) - m = elt_duration_; - return m; } void -Request_chord_iterator::do_print() const +Music_iterator::quit () { -#ifndef NPRINT - mtor << "duration: " << elt_duration_; -#endif + do_quit (); + handle_.quit (); } + void -Request_chord_iterator::process_and_next(Moment mom) +Music_iterator::do_quit() { - if ( first_b_ ) { - for (PCursor i(elt_l_->music_p_list_); i.ok(); i++) { - assert(i->is_type_b(Request::static_name())); - Request * req_l = (Request*)i.ptr(); - bool gotcha = report_to_l()->try_request(req_l); - if (!gotcha) - req_l->warning("Junking request: " + String(req_l->name())); - - } - first_b_ = false; - } - - if ( mom >= elt_duration_ ) - last_b_ = true; }