X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic-iterator.cc;h=b75f1e3281930b391a321e421a248a58169059da;hb=12b33a8040a80d5b4a1217faf0d4cc7529483cc0;hp=2b329815d6596e4ee5ddc89f89f165cffc2cce7a;hpb=30270f615f32a6b93e7b09bf55d1b8a7d7aad7ca;p=lilypond.git diff --git a/lily/music-iterator.cc b/lily/music-iterator.cc index 2b329815d6..b75f1e3281 100644 --- a/lily/music-iterator.cc +++ b/lily/music-iterator.cc @@ -3,186 +3,190 @@ source file of the GNU LilyPond music typesetter - (c) 1997--1998 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ + +/* + UGH. too many includes. + */ #include "debug.hh" -#include "music-list.hh" #include "music-iterator.hh" -#include "voice-iterator.hh" -#include "property-iterator.hh" -#include "chord-iterator.hh" -#include "request-iterator.hh" #include "translator-group.hh" -#include "translation-property.hh" -#include "change-iterator.hh" -#include "change-translator.hh" #include "music-wrapper.hh" #include "music-wrapper-iterator.hh" -#include "compressed-music-iterator.hh" -#include "compressed-music.hh" - - - -IMPLEMENT_IS_TYPE_B(Music_iterator); +#include "simple-music-iterator.hh" +#include "context-specced-music.hh" - -void -Music_iterator::do_print() const +Music_iterator::Music_iterator () { - } -void -Music_iterator::print() const -{ -#ifndef NPRINT - if (!check_debug) - return ; - DOUT << name() << "{"; - DOUT << "report to " << - report_to_l() << " (" << report_to_l ()->name () << ")\n"; - if (ok()) - DOUT << "next at " << next_moment() << " "; - else - DOUT << "not feeling well today.."; - do_print(); - DOUT << "}\n"; -#endif -} - -Translator_group* -Music_iterator::get_req_translator_l() +Music_iterator::Music_iterator (Music_iterator const& src) { - assert (report_to_l()); - if (report_to_l()->is_bottom_translator_b ()) - return report_to_l(); - - set_translator (report_to_l()->get_default_interpreter ()); - return report_to_l(); + handle_ = *src.handle_.clone (); + music_l_ = src.music_l_; + music_length_ = src.music_length_; + start_mom_ = src.start_mom_; } -void -Music_iterator::push_translator (Translator_group*t) +Music_iterator::~Music_iterator () { - report_to_l_arr_.push (t); - t->iterator_count_ ++; } -void -Music_iterator::pop_translator() -{ - report_to_l()->iterator_count_ --; - assert (report_to_l()->iterator_count_ >=0); - report_to_l_arr_.pop(); -} + + Translator_group* -Music_iterator::report_to_l() const +Music_iterator::report_to_l () const { - if (! report_to_l_arr_.size()) - return 0; - return report_to_l_arr_.top(); + return handle_.report_to_l (); } void -Music_iterator::set_translator (Translator_group*trans) -{ - if (report_to_l()==trans) - return; - if (report_to_l()) - pop_translator(); - if (trans) - push_translator (trans); -} - -void -Music_iterator::construct_children() +Music_iterator::set_translator (Translator_group *trans) { - + handle_.set_translator (trans); } -Music_iterator::~Music_iterator() +void +Music_iterator::construct_children () { - set_translator (0); } Moment -Music_iterator::next_moment() const +Music_iterator::pending_moment () const { return 0; } - void -Music_iterator::process_and_next (Moment m) +Music_iterator::process (Moment) { - do_process_and_next (m); +} + +bool +Music_iterator::ok () const +{ + return false; } void -Music_iterator::do_process_and_next (Moment) +Music_iterator::skip (Moment) { - first_b_ = false; } -bool -Music_iterator::ok() const +SCM +Music_iterator::get_music (Moment)const { - return first_b_; + return SCM_EOL; } Music_iterator* -Music_iterator::static_get_iterator_p (Music const *m, Translator_group *report_l) +Music_iterator::static_get_iterator_p (Music *m) { Music_iterator * p =0; - if (m->is_type_b (Request_chord::static_name())) - p = new Request_chord_iterator; - else if (m->is_type_b (Simultaneous_music::static_name())) - p = new Simultaneous_music_iterator; - else if (m->is_type_b (Sequential_music::static_name())) - p = new Sequential_music_iterator; - else if (m->is_type_b (Translation_property::static_name ())) - p = new Property_iterator; - else if (m->is_type_b (Change_translator::static_name ())) - p = new Change_iterator; - else if (m->is_type_b (Compressed_music::static_name ())) - p = new Compressed_music_iterator; - else if (m->is_type_b (Music_wrapper::static_name ())) - p = new Music_wrapper_iterator; - p->music_l_ = m; - if (m->translator_type_str_.length_i ()) + SCM ctor = m->get_mus_property ("iterator-ctor") ; + if (unsmob_cxx_function (ctor)) { - Translator_group* a =report_l-> - find_create_translator_l (m->translator_type_str_, m->translator_id_str_); - p->set_translator (a); + Cxx_function f = unsmob_cxx_function (ctor); + + p = (Music_iterator*) (*f) (SCM_EOL); + } + else if (dynamic_cast (m)) + p = new Music_wrapper_iterator; + else + { + p = new Simple_music_iterator ; } - if (! p->report_to_l()) - p ->set_translator (report_l); - - + p->music_l_ = m; + assert (m); + p->music_length_ = m->length_mom (); + p->start_mom_ = m->start_mom (); return p; } + +Moment +Music_iterator::music_length_mom () const +{ + return music_length_; + +} + +Moment +Music_iterator::music_start_mom ()const +{ + return start_mom_; +} + void -Music_iterator::inherit_info(Music_iterator const *) +Music_iterator::init_translator (Music *m, Translator_group *report_l) { + music_l_ = m; + assert (m); + if (Context_specced_music * csm =dynamic_cast (m)) + { + SCM ct = csm->get_mus_property ("context-type"); + String c_type; + if (gh_string_p (ct)) + c_type = ly_scm2string (ct); + + String c_id; + SCM ci = csm->get_mus_property ("context-id"); + if (gh_string_p (ci)) + c_id = ly_scm2string (ci); + + Translator_group* a + =report_l->find_create_translator_l (c_type, c_id); + + set_translator (a); + + } + + if (! report_to_l ()) + set_translator (report_l); } + Music_iterator* -Music_iterator::get_iterator_p (Music const*m) const +Music_iterator::get_iterator_p (Music *m) const { - Music_iterator*p = static_get_iterator_p (m, report_to_l()); - p->inherit_info (this); - p->construct_children(); + Music_iterator*p = static_get_iterator_p (m); + p->init_translator (m, report_to_l ()); + + p->construct_children (); return p; } -Music_iterator::Music_iterator() +/* + TODO: rename to prevent confusion between Translator::try_music and + Iterator::try_music + + */ + +Music_iterator* +Music_iterator::try_music (Music *m) const +{ + bool b = report_to_l ()->try_music ((Music*)m); // ugh + Music_iterator * it = b ? (Music_iterator*) this : 0; // ugh + if (!it) + it = try_music_in_children (m); + return it; +} + +Music_iterator* +Music_iterator::try_music_in_children (Music *) const { - first_b_ = true; + return 0; } +IMPLEMENT_CTOR_CALLBACK (Music_iterator); +Music * +Music_iterator::music_l () const +{ + return music_l_; +}