X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic-iterator.cc;h=dcb596a117071a3d8fe78610b3c8992e0635a25c;hb=5287c2ed78ed3d434d67651896902f23a9b52eb1;hp=39478c2d0594844ebc121b4c4a56ca757b05425b;hpb=45f9f9a9e20cd16ea8ef0ae5410a6d71495b962f;p=lilypond.git diff --git a/lily/music-iterator.cc b/lily/music-iterator.cc index 39478c2d05..dcb596a117 100644 --- a/lily/music-iterator.cc +++ b/lily/music-iterator.cc @@ -3,214 +3,174 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ /* UGH. too many includes. */ -#include "debug.hh" -#include "music-list.hh" +#include "warn.hh" #include "music-iterator.hh" -#include "property-iterator.hh" -#include "request-chord-iterator.hh" -#include "sequential-music-iterator.hh" -#include "simultaneous-music-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 "time-scaled-music-iterator.hh" -#include "time-scaled-music.hh" +#include "simple-music-iterator.hh" #include "context-specced-music.hh" -#include "repeated-music.hh" -#include "folded-repeat-iterator.hh" -#include "unfolded-repeat-iterator.hh" -#include "grace-iterator.hh" -#include "grace-music.hh" -#include "lyric-combine-music.hh" -#include "lyric-combine-music-iterator.hh" -#include "auto-change-music.hh" -#include "auto-change-iterator.hh" -#include "part-combine-music.hh" -#include "part-combine-music-iterator.hh" -#include "request.hh" -#include "request-iterator.hh" -#include "output-property.hh" -#include "chord-tremolo-iterator.hh" -void -Music_iterator::do_print() const +Music_iterator::Music_iterator () { } -void -Music_iterator::print() const -{ -#ifndef NPRINT - if (!flower_dstream) - return ; - DEBUG_OUT << classname(this) << "{"; - Translator_group *t = report_to_l(); - DEBUG_OUT << "report to " << t->type_str_ << " = " << t->id_str_ << "\n"; - if (ok()) - DEBUG_OUT << "next at " << next_moment() << " "; - else - DEBUG_OUT << "not feeling well today.."; - do_print(); - DEBUG_OUT << "}\n"; -#endif +Music_iterator::Music_iterator (Music_iterator const& src) +{ + handle_ = *src.handle_.clone (); + music_ = src.music_; + music_length_ = src.music_length_; + start_mom_ = src.start_mom_; } -Translator_group* -Music_iterator::get_req_translator_l() +Music_iterator::~Music_iterator () { - 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(); } + + Translator_group* -Music_iterator::report_to_l() const +Music_iterator::report_to () const { - return handle_.report_to_l (); + return handle_.report_to (); } void -Music_iterator::set_translator (Translator_group*trans) +Music_iterator::set_translator (Translator_group *trans) { handle_.set_translator (trans); } void -Music_iterator::construct_children() -{ -} - -Music_iterator::~Music_iterator() +Music_iterator::construct_children () { } 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) +{ +} + +bool +Music_iterator::ok () const { - do_process_and_next (m); + 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_pending_events (Moment)const { - return first_b_; + return SCM_EOL; } Music_iterator* -Music_iterator::static_get_iterator_p (Music *m) +Music_iterator::get_static_get_iterator (Music *m) { Music_iterator * p =0; - /* It would be nice to do this decentrally, but the order of this is - significant. */ - if (dynamic_cast (m)) - p = new Request_chord_iterator; - else if (dynamic_cast (m)) - p = new Lyric_combine_music_iterator; - else if (dynamic_cast (m)) - p = new Simultaneous_music_iterator; - else if (dynamic_cast (m)) - p = new Sequential_music_iterator; - else if (dynamic_cast (m)) - p = new Property_iterator; - else if (dynamic_cast (m)) - p = new Change_iterator; - else if (dynamic_cast(m)) - p = new Push_property_iterator; - else if (dynamic_cast(m)) - p = new Pop_property_iterator; - else if (dynamic_cast (m)) - p = new Time_scaled_music_iterator; - else if (dynamic_cast (m)) - p = new Grace_iterator; - else if (dynamic_cast (m)) - p = new Auto_change_iterator; - else if (dynamic_cast (m)) - p = new Part_combine_music_iterator; - else if (dynamic_cast (m)) - p = new Music_wrapper_iterator; - else if (Repeated_music * n = dynamic_cast (m)) + SCM ctor = m->get_mus_property ("iterator-ctor") ; + if (unsmob_cxx_function (ctor)) { - if (n->type_ == "tremolo") - p = new Chord_tremolo_iterator; - else if (n->fold_b_) - p = new Folded_repeat_iterator; - else - p = new Unfolded_repeat_iterator; + 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 ; } - p->music_l_ = m; + p->music_ = 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::init_translator (Music *m, Translator_group *report_l) +Music_iterator::init_translator (Music *m, Translator_group *report) { - music_l_ = m; - if (Context_specced_music * csm =dynamic_cast(m)) + music_ = m; + assert (m); + if (Context_specced_music * csm =dynamic_cast (m)) { - Translator_group* a =report_l-> - find_create_translator_l (csm->translator_type_str_, csm->translator_id_str_); + 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->find_create_translator (c_type, c_id); set_translator (a); } - if (! report_to_l()) - set_translator (report_l); + if (! report_to ()) + set_translator (report); } Music_iterator* -Music_iterator::get_iterator_p (Music *m) const +Music_iterator::get_iterator (Music *m) const { - Music_iterator*p = static_get_iterator_p (m); - p->init_translator (m, report_to_l()); + Music_iterator*p = get_static_get_iterator (m); + p->init_translator (m, report_to ()); - p->construct_children(); + p->construct_children (); return p; } -Music_iterator::Music_iterator() -{ - first_b_ = true; -} +/* + TODO: rename to prevent confusion between Translator::try_music and + Iterator::try_music + + */ Music_iterator* -Music_iterator::try_music (Music *m) const +Music_iterator::try_music (Music *m) const { - bool b = report_to_l ()->try_music ((Music*)m); // ugh + 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); @@ -218,13 +178,15 @@ Music_iterator::try_music (Music *m) const } Music_iterator* -Music_iterator::try_music_in_children (Music * ) const +Music_iterator::try_music_in_children (Music *) const { return 0; } -Music* -Music_iterator::get_next_music () +IMPLEMENT_CTOR_CALLBACK (Music_iterator); + +Music * +Music_iterator::get_music () const { - return 0; + return music_; }