X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic-iterator.cc;h=057d4f01ebcf9618739b282b0d28e8b715b3aa9e;hb=8cab78caa0db1ba14f2e52e4c1ddbb541ea0e5cb;hp=a6d2a721a44c6b8cc7a95a22bcea03c5ae16692f;hpb=d765f3af45be51f15da55cf570a4b172200e1035;p=lilypond.git diff --git a/lily/music-iterator.cc b/lily/music-iterator.cc index a6d2a721a4..057d4f01eb 100644 --- a/lily/music-iterator.cc +++ b/lily/music-iterator.cc @@ -3,19 +3,22 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2002 Han-Wen Nienhuys + (c) 1997--2009 Han-Wen Nienhuys */ -/* - UGH. too many includes. - */ + +#include +using namespace std; + #include "warn.hh" -#include "music-iterator.hh" -#include "translator-group.hh" +#include "music.hh" +#include "context.hh" +#include "event-iterator.hh" +#include "input.hh" +#include "international.hh" #include "music-wrapper.hh" #include "music-wrapper-iterator.hh" #include "simple-music-iterator.hh" -#include "context-specced-music.hh" #include "ly-smobs.icc" @@ -25,29 +28,25 @@ Music_iterator::Music_iterator () smobify_self (); } -Music_iterator::Music_iterator (Music_iterator const& src) +Music_iterator::Music_iterator (Music_iterator const &) { - handle_ = *src.handle_.clone (); - music_ = src.music_; - music_length_ = src.music_length_; - start_mom_ = src.start_mom_; - smobify_self (); + assert (false); } Music_iterator::~Music_iterator () { } -Translator_group* -Music_iterator::report_to () const +Context * +Music_iterator::get_outlet () const { - return handle_.report_to (); + 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 @@ -72,50 +71,41 @@ Music_iterator::ok () const return false; } -void -Music_iterator::skip (Moment) -{ -} - -SCM -Music_iterator::get_pending_events (Moment)const -{ - return SCM_EOL; -} - SCM Music_iterator::get_static_get_iterator (Music *m) { - Music_iterator * p =0; + Music_iterator *p = 0; - SCM ctor = m->get_mus_property ("iterator-ctor") ; + SCM ctor = m->get_property ("iterator-ctor"); SCM iter = SCM_EOL; - if (gh_procedure_p (ctor)) + if (ly_is_procedure (ctor)) { - iter = gh_call0 (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(); - scm_gc_unprotect_object (iter); + iter = p->self_scm (); + p->unprotect (); } p->music_ = m; assert (m); - p->music_length_ = m->length_mom (); + 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_; } @@ -127,65 +117,60 @@ Music_iterator::music_start_mom ()const } void -Music_iterator::init_translator (Music *m, Translator_group *report) +Music_iterator::init_context (Music *m, Context *report) { music_ = 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->find_create_translator (c_type, c_id); - - set_translator (a); - - } + if (! get_outlet ()) + set_context (report); +} - if (! report_to ()) - set_translator (report); +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 *) +{ +} SCM Music_iterator::get_iterator (Music *m) const { SCM ip = get_static_get_iterator (m); - Music_iterator*p = unsmob_iterator (ip); - - p->init_translator (m, report_to ()); - + Music_iterator *p = unsmob_iterator (ip); + + p->init_context (m, get_outlet ()); + p->construct_children (); return ip; } -/* - TODO: rename to prevent confusion between Translator::try_music and - Iterator::try_music - - */ -Music_iterator* -Music_iterator::try_music (Music *m) const +/* Descend to a bottom context; implicitly create a new one if necessary */ +void +Music_iterator::descend_to_bottom_context () { - 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; + assert (get_outlet ()); + if (!get_outlet ()->is_bottom_context ()) + set_context (get_outlet ()->get_default_interpreter ()); } -Music_iterator* -Music_iterator::try_music_in_children (Music *) const +void +Music_iterator::report_event (Music *m) { - return 0; + descend_to_bottom_context (); + + /* + FIXME: then don't do it. + */ + if (!m->is_mus_type ("event")) + m->origin ()->programming_error (_ ("Sending non-event to context")); + + m->send_to_context (get_outlet ()); } IMPLEMENT_CTOR_CALLBACK (Music_iterator); @@ -198,38 +183,41 @@ Music_iterator::get_music () const /****************************************************************/ -IMPLEMENT_TYPE_P (Music_iterator, "ly-iterator?"); -IMPLEMENT_SMOBS(Music_iterator); -IMPLEMENT_DEFAULT_EQUAL_P(Music_iterator); +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); + 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->get_outlet ()) + scm_gc_mark (mus->get_outlet ()->self_scm ()); if (mus->music_) - scm_gc_mark (mus->music_->self_scm()); - + scm_gc_mark (mus->music_->self_scm ()); return SCM_EOL; } int -Music_iterator::print_smob (SCM , SCM port, scm_print_state*) +Music_iterator::print_smob (SCM sm, SCM port, scm_print_state*) { - scm_puts ("#", port); + char s[1000]; + + 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::derived_mark ()const { } @@ -237,10 +225,37 @@ void Music_iterator::quit () { do_quit (); - handle_.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::do_quit() +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); }