X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic-iterator.cc;h=99972ab6d607abdef5a3a2af92b497851012a918;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=c2b6c0dda3fc752a678d4645109c44ddc27a83cb;hpb=ef8093ad63c7a00a169cf88d71368b204dd65655;p=lilypond.git diff --git a/lily/music-iterator.cc b/lily/music-iterator.cc index c2b6c0dda3..99972ab6d6 100644 --- a/lily/music-iterator.cc +++ b/lily/music-iterator.cc @@ -3,17 +3,19 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2003 Han-Wen Nienhuys + (c) 1997--2008 Han-Wen Nienhuys */ -/* - UGH. too many includes. - */ -#include + +#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" @@ -26,7 +28,7 @@ Music_iterator::Music_iterator () smobify_self (); } -Music_iterator::Music_iterator (Music_iterator const& src) +Music_iterator::Music_iterator (Music_iterator const &) { assert (false); } @@ -35,16 +37,16 @@ Music_iterator::~Music_iterator () { } -Translator_group* +Context * Music_iterator::get_outlet () const { 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 @@ -69,39 +71,39 @@ Music_iterator::ok () const return false; } - - 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->get_length (); p->start_mom_ = m->start_mom (); + return iter; } - Moment Music_iterator::music_get_length () const { @@ -115,24 +117,24 @@ 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 (! get_outlet ()) - set_translator (report); + set_context (report); } void -Music_iterator::substitute_outlet (Translator_group*f, Translator_group *t) +Music_iterator::substitute_outlet (Context *f, Context *t) { if (get_outlet () == f) - set_translator (t); - derived_substitute (f,t); + set_context (t); + derived_substitute (f, t); } void -Music_iterator::derived_substitute (Translator_group*,Translator_group*) +Music_iterator::derived_substitute (Context *, Context *) { } @@ -140,33 +142,35 @@ 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, get_outlet ()); - + 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 = 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; + 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); @@ -180,41 +184,40 @@ Music_iterator::get_music () const /****************************************************************/ IMPLEMENT_TYPE_P (Music_iterator, "ly:iterator?"); -IMPLEMENT_SMOBS(Music_iterator); -IMPLEMENT_DEFAULT_EQUAL_P(Music_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->get_outlet ()) - scm_gc_mark (mus->get_outlet ()->self_scm()); + 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 sm , SCM port, scm_print_state*) +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)); + sprintf (s, "#<%s>", iter->class_name ()); scm_puts (s, port); return 1; } void -Music_iterator::derived_mark()const +Music_iterator::derived_mark ()const { } @@ -222,11 +225,11 @@ void Music_iterator::quit () { do_quit (); - handle_.quit (); + handle_.set_context (0); } void -Music_iterator::do_quit() +Music_iterator::do_quit () { } @@ -235,3 +238,24 @@ 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); +}