X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic-iterator.cc;h=bd7dcee4eb8da6105cc560993215401bf5b45aa2;hb=9fc8eafc925fc7481d1163a43fb02c9b1f28fb9c;hp=eb05061be111725ae884dd667f37b82ae6a74639;hpb=cda8fc1780778b760905c8832f7e984161218f20;p=lilypond.git diff --git a/lily/music-iterator.cc b/lily/music-iterator.cc index eb05061be1..bd7dcee4eb 100644 --- a/lily/music-iterator.cc +++ b/lily/music-iterator.cc @@ -3,51 +3,50 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2005 Han-Wen Nienhuys */ /* UGH. too many includes. - */ -#include "debug.hh" +*/ + #include "music-iterator.hh" -#include "translator-group.hh" + +#include + +#include "warn.hh" +#include "context.hh" #include "music-wrapper.hh" #include "music-wrapper-iterator.hh" #include "simple-music-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 @@ -61,7 +60,6 @@ Music_iterator::pending_moment () const return 0; } - void Music_iterator::process (Moment) { @@ -73,101 +71,188 @@ Music_iterator::ok () const return false; } -void -Music_iterator::skip (Moment ) -{ -} - SCM -Music_iterator::get_music (Moment)const -{ - 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; + Music_iterator *p = 0; - SCM ctor = m->get_mus_property ("iterator-ctor") ; - if (unsmob_cxx_function (ctor)) + SCM ctor = m->get_property ("iterator-ctor"); + SCM iter = SCM_EOL; + if (ly_c_procedure_p (ctor)) { - Cxx_function f = unsmob_cxx_function (ctor); - - p = (Music_iterator*) (*f) (SCM_EOL); + iter = scm_call_0 (ctor); + p = unsmob_iterator (iter); } - else if (dynamic_cast (m)) - p = new Music_wrapper_iterator; else { - p = new Simple_music_iterator ; + if (dynamic_cast (m)) + p = new Music_wrapper_iterator; + else + p = new Simple_music_iterator; + + iter = p->self_scm (); + scm_gc_unprotect_object (iter); } - p->music_l_ = m; - p->music_length_ = m->length_mom (); - - return p; -} + p->music_ = m; + assert (m); + p->music_length_ = m->get_length (); + p->start_mom_ = m->start_mom (); + return iter; +} Moment -Music_iterator::music_length_mom() const +Music_iterator::music_get_length () 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, Context *report) { - 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); - - } + music_ = m; + assert (m); + if (! get_outlet ()) + set_context (report); +} - if (! report_to_l ()) - set_translator (report_l); +void +Music_iterator::substitute_outlet (Context *f, Context *t) +{ + if (get_outlet () == f) + set_context (t); + derived_substitute (f, t); } +void +Music_iterator::derived_substitute (Context *, Context *) +{ +} -Music_iterator* -Music_iterator::get_iterator_p (Music *m) const +SCM +Music_iterator::get_iterator (Music *m) const { - Music_iterator*p = static_get_iterator_p (m); - p->init_translator (m, report_to_l ()); - + SCM ip = get_static_get_iterator (m); + Music_iterator *p = unsmob_iterator (ip); + + p->init_translator (m, get_outlet ()); + p->construct_children (); - return p; + return ip; } -Music_iterator* +/* + TODO: rename to prevent confusion between Context::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 + bool b = get_outlet ()->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 * Music_iterator::try_music_in_children (Music *) const { return 0; } -IMPLEMENT_CTOR_CALLBACK(Music_iterator); +IMPLEMENT_CTOR_CALLBACK (Music_iterator); + +Music * +Music_iterator::get_music () const +{ + return music_; +} + +/****************************************************************/ + +IMPLEMENT_TYPE_P (Music_iterator, "ly:iterator?"); +IMPLEMENT_SMOBS (Music_iterator); +IMPLEMENT_DEFAULT_EQUAL_P (Music_iterator); + +SCM +Music_iterator::mark_smob (SCM smob) +{ + 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; +} + +int +Music_iterator::print_smob (SCM sm, SCM port, scm_print_state*) +{ + char s[1000]; + + Music_iterator *iter = unsmob_iterator (sm); + sprintf (s, "#<%s>", classname (iter)); + scm_puts (s, port); + return 1; +} + +void +Music_iterator::derived_mark ()const +{ +} + +void +Music_iterator::quit () +{ + do_quit (); + handle_.set_context (0); +} + +void +Music_iterator::do_quit () +{ +} + +bool +Music_iterator::run_always ()const +{ + 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); +}