X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic-iterator.cc;h=83838427df32aac99a381dd0b2f157bff6b6faaa;hb=55c7ef27b5382940b8afe785c94b744c24b98473;hp=08f454fae1e303b8d255c0579729d7f2876735ad;hpb=0af6d4cb04fa3e4aa69a7aecb76034e4cb1ec49b;p=lilypond.git diff --git a/lily/music-iterator.cc b/lily/music-iterator.cc index 08f454fae1..83838427df 100644 --- a/lily/music-iterator.cc +++ b/lily/music-iterator.cc @@ -3,66 +3,51 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2006 Han-Wen Nienhuys */ -/* - UGH. too many includes. - */ -#include "debug.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 "change-iterator.hh" + +#include +using namespace std; + +#include "warn.hh" +#include "context.hh" +#include "event-iterator.hh" +#include "input.hh" +#include "international.hh" #include "music-wrapper.hh" #include "music-wrapper-iterator.hh" -#include "time-scaled-music-iterator.hh" -#include "repeated-music.hh" -#include "folded-repeat-iterator.hh" -#include "unfolded-repeat-iterator.hh" -#include "grace-iterator.hh" -#include "lyric-combine-music-iterator.hh" -#include "auto-change-iterator.hh" -#include "part-combine-music-iterator.hh" #include "simple-music-iterator.hh" -#include "output-property-music-iterator.hh" -#include "chord-tremolo-iterator.hh" -#include "context-specced-music.hh" + +#include "ly-smobs.icc" Music_iterator::Music_iterator () { - // clone_i_ = 0; + music_ = 0; + smobify_self (); } -Music_iterator::Music_iterator (Music_iterator const& src) +Music_iterator::Music_iterator (Music_iterator const &) { - // clone_i_ = src.clone_i_ + 1; - handle_ = *src.handle_.clone (); - music_l_ = src.music_l_; - music_length_ = src.music_length_; + assert (false); } Music_iterator::~Music_iterator () { } - - - -Translator_group* -Music_iterator::report_to_l () const +Context * +Music_iterator::get_outlet () const { - return handle_.report_to_l (); + return handle_.get_outlet (); } - void -Music_iterator::set_translator (Translator_group *trans) +Music_iterator::set_context (Context *trans) { - handle_.set_translator (trans); + handle_.set_context (trans); } void @@ -76,7 +61,6 @@ Music_iterator::pending_moment () const return 0; } - void Music_iterator::process (Moment) { @@ -88,148 +72,191 @@ Music_iterator::ok () const return false; } +SCM +Music_iterator::get_static_get_iterator (Music *m) +{ + Music_iterator *p = 0; + + SCM ctor = m->get_property ("iterator-ctor"); + SCM iter = SCM_EOL; + if (ly_is_procedure (ctor)) + { + iter = scm_call_0 (ctor); + p = unsmob_iterator (iter); + } + else + { + if (dynamic_cast (m)) + p = new Music_wrapper_iterator; + else if (m->is_mus_type ("event")) + p = new Event_iterator; + else + p = new Simple_music_iterator; + + iter = p->self_scm (); + p->unprotect (); + } + + p->music_ = m; + assert (m); + p->music_length_ = m->get_length (); + p->start_mom_ = m->start_mom (); + + return iter; +} + +Moment +Music_iterator::music_get_length () const +{ + return music_length_; +} + +Moment +Music_iterator::music_start_mom ()const +{ + return start_mom_; +} + void -Music_iterator::skip (Moment ) +Music_iterator::init_translator (Music *m, Context *report) { + music_ = m; + assert (m); + if (! get_outlet ()) + set_context (report); } -SCM -Music_iterator::get_music (Moment)const +void +Music_iterator::substitute_outlet (Context *f, Context *t) { - return SCM_EOL; + if (get_outlet () == f) + set_context (t); + derived_substitute (f, t); } +void +Music_iterator::derived_substitute (Context *, Context *) +{ +} +SCM +Music_iterator::get_iterator (Music *m) const +{ + SCM ip = get_static_get_iterator (m); + Music_iterator *p = unsmob_iterator (ip); -/* We could do this decentrally: + p->init_translator (m, get_outlet ()); - - Declare a new smob-type, which stores a function ptr in its CDR - (and not a struct ptr). The function ptr has signature + p->construct_children (); + return ip; +} - Music_iterator* (*)() +/* Descend to a bottom context; implicitly create a new one if necessary */ +void +Music_iterator::descend_to_bottom_context () +{ + assert (get_outlet ()); + if (!get_outlet ()->is_bottom_context ()) + set_context (get_outlet ()->get_default_interpreter ()); +} - - initialize all music with a set_mus_property("iterator-ctor"), +void +Music_iterator::report_event (Music *m) +{ + descend_to_bottom_context (); - - do - - func_ptr p = (func_ptr) gh_cdr (get_mus_property ("iterator-ctor")); - iter_p = (*p)(); + /* + FIXME: then don't do it. + */ + if (!m->is_mus_type ("event")) + m->origin ()->programming_error (_f ("Sending non-event to context")); -*/ + m->send_to_context (get_outlet ()); +} -Music_iterator* -Music_iterator::static_get_iterator_p (Music *m) -{ - Music_iterator * p =0; - - SCM type = m->get_mus_property ("type") ; - - if (type == ly_symbol2scm ("property-set")) - p = new Property_iterator; - else if (type == ly_symbol2scm ("property-push")) - p = new Push_property_iterator; - else if (type == ly_symbol2scm ("property-pop")) - p = new Pop_property_iterator; - else if (type == ly_symbol2scm ("output-property")) - p = new Output_property_music_iterator; - else if (type == ly_symbol2scm ("request-chord")) - p = new Request_chord_iterator; - else if (type == ly_symbol2scm ("lyric-combine-music")) - p = new Lyric_combine_music_iterator; - else if (type == ly_symbol2scm ("simultaneous-music")) - p = new Simultaneous_music_iterator; - else if (type == ly_symbol2scm ("sequential-music")) - p = new Sequential_music_iterator; - else if (type == ly_symbol2scm ("change-translator")) - p = new Change_iterator; - else if (type == ly_symbol2scm ("time-scaled-music")) - p = new Time_scaled_music_iterator; - else if (type == ly_symbol2scm ("grace-music")) - p = new Grace_iterator; - else if (type == ly_symbol2scm ("auto-change-music")) - p = new Auto_change_iterator; - else if (type == ly_symbol2scm ("part-combined-music")) - p = new Part_combine_music_iterator; - else if (dynamic_cast (m)) - p = new Music_wrapper_iterator; - else if (Repeated_music * n = dynamic_cast (m)) - { - 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; - } - else - { - p = new Simple_music_iterator ; - } +IMPLEMENT_CTOR_CALLBACK (Music_iterator); - p->music_l_ = m; - p->music_length_ = m->length_mom (); - - return p; +Music * +Music_iterator::get_music () const +{ + return music_; } +/****************************************************************/ -Moment -Music_iterator::music_length_mom() const +IMPLEMENT_TYPE_P (Music_iterator, "ly:iterator?"); +IMPLEMENT_SMOBS (Music_iterator); +IMPLEMENT_DEFAULT_EQUAL_P (Music_iterator); + +SCM +Music_iterator::mark_smob (SCM smob) { - return music_length_; + 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->get_outlet ()) + scm_gc_mark (mus->get_outlet ()->self_scm ()); + if (mus->music_) + scm_gc_mark (mus->music_->self_scm ()); + + return SCM_EOL; } -void -Music_iterator::init_translator (Music *m, Translator_group *report_l) +int +Music_iterator::print_smob (SCM sm, SCM port, scm_print_state*) { - music_l_ = 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); - - } + char s[1000]; - if (! report_to_l ()) - set_translator (report_l); + Music_iterator *iter = unsmob_iterator (sm); + sprintf (s, "#<%s>", iter->class_name ()); + scm_puts (s, port); + return 1; } +void +Music_iterator::derived_mark ()const +{ +} -Music_iterator* -Music_iterator::get_iterator_p (Music *m) const +void +Music_iterator::quit () { - Music_iterator*p = static_get_iterator_p (m); - p->init_translator (m, report_to_l ()); - - p->construct_children (); - return p; + do_quit (); + handle_.set_context (0); } -Music_iterator* -Music_iterator::try_music (Music *m) const +void +Music_iterator::do_quit () { - 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 +bool +Music_iterator::run_always ()const { - return 0; + return false; } +bool +is_child_context (Context *me, Context *child) +{ + while (child && child != me) + child = child->get_parent_context (); + + return child == me; +} + +/* + move to context of child iterator if it is deeper down in the + hierarchy. +*/ +void +Music_iterator::descend_to_child (Context *child_report) +{ + Context *me_report = get_outlet (); + if (is_child_context (me_report, child_report)) + set_context (child_report); +}