X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic-iterator.cc;h=9964be5b7b94f2e0efae799dafb25bc3339c1789;hb=4c8187e65dd9708d7733692842acc696da121bf1;hp=ef36b59d149a2f552e0ed5cb475d4e05c94c459c;hpb=2862b1027f316a2f0444fa92e441ee28acf7a463;p=lilypond.git diff --git a/lily/music-iterator.cc b/lily/music-iterator.cc index ef36b59d14..9964be5b7b 100644 --- a/lily/music-iterator.cc +++ b/lily/music-iterator.cc @@ -3,157 +3,230 @@ source file of the GNU LilyPond music typesetter - (c) 1997 Han-Wen Nienhuys + (c) 1997--2003 Han-Wen Nienhuys */ -#include "debug.hh" -#include "music-list.hh" -#include "music-iterator.hh" -#include "voice-iterator.hh" -#include "chord-iterator.hh" -#include "request-iterator.hh" -#include "translator.hh" +/* + UGH. too many includes. + */ +#include -IMPLEMENT_IS_TYPE_B(Music_iterator); +#include "warn.hh" +#include "music-iterator.hh" +#include "translator-group.hh" +#include "music-wrapper.hh" +#include "music-wrapper-iterator.hh" +#include "simple-music-iterator.hh" +#include "ly-smobs.icc" -void -Music_iterator::do_print() const +Music_iterator::Music_iterator () { - + music_ = 0; + smobify_self (); } -void -Music_iterator::print() const -{ -#ifndef NPRINT - if (!check_debug) - return ; - DOUT << name() << "{"; - DOUT << "report to " << - report_to_l() << " (" << report_to_l ()->name () << ")\n"; - if (ok()) - DOUT << "next at " << next_moment() << " "; - else - DOUT << "not feeling well today.."; - do_print(); - DOUT << "}\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_; + smobify_self (); } -Translator * -Music_iterator::get_req_translator_l() +Music_iterator::~Music_iterator () { - assert (report_to_l()); - if (report_to_l()->is_bottom_engraver_b ()) - return report_to_l(); +} - set_translator (report_to_l()->get_default_interpreter ()); - return report_to_l(); +Translator_group* +Music_iterator::report_to () const +{ + return handle_.report_to (); } void -Music_iterator::push_translator (Translator*t) +Music_iterator::set_translator (Translator_group *trans) { - report_to_l_arr_.push (t); - t->iterator_count_ ++; + handle_.set_translator (trans); } void -Music_iterator::pop_translator() +Music_iterator::construct_children () { - report_to_l()->iterator_count_ --; - assert (report_to_l()->iterator_count_ >=0); - report_to_l_arr_.pop(); } -Translator* -Music_iterator::report_to_l() const +Moment +Music_iterator::pending_moment () const { - if (! report_to_l_arr_.size()) - return 0; - return report_to_l_arr_.top(); + return 0; } - void -Music_iterator::set_translator (Translator*trans) -{ - if (report_to_l()==trans) - return; - if (report_to_l()) - pop_translator(); - if (trans) - push_translator (trans); +Music_iterator::process (Moment) +{ +} + +bool +Music_iterator::ok () const +{ + return false; } void -Music_iterator::construct_children() +Music_iterator::skip (Moment) { +} +SCM +Music_iterator::get_pending_events (Moment)const +{ + return SCM_EOL; } -Music_iterator::~Music_iterator() +SCM +Music_iterator::get_static_get_iterator (Music *m) { - set_translator (0); + Music_iterator * p =0; + + SCM ctor = m->get_mus_property ("iterator-ctor") ; + SCM iter = SCM_EOL; + if (gh_procedure_p (ctor)) + { + iter = gh_call0 (ctor); + p = unsmob_iterator (iter); + } + else + { + 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_ = m; + assert (m); + p->music_length_ = m->get_length (); + p->start_mom_ = m->start_mom (); + return iter; } + Moment -Music_iterator::next_moment() const +Music_iterator::music_get_length () const { - return 0; + return music_length_; +} + +Moment +Music_iterator::music_start_mom ()const +{ + return start_mom_; } void -Music_iterator::process_and_next (Moment) +Music_iterator::init_translator (Music *m, Translator_group *report) { - first_b_ = false; + music_ = m; + assert (m); + if (! report_to ()) + set_translator (report); } -bool -Music_iterator::ok() const + +SCM +Music_iterator::get_iterator (Music *m) const { - return first_b_; + SCM ip = get_static_get_iterator (m); + Music_iterator*p = unsmob_iterator (ip); + + p->init_translator (m, report_to ()); + + p->construct_children (); + return ip; } +/* + TODO: rename to prevent confusion between Translator::try_music and + Iterator::try_music + + */ Music_iterator* -Music_iterator::static_get_iterator_p (Music *m, - Translator *report_l) +Music_iterator::try_music (Music *m) const { - Music_iterator * p =0; - if (m->is_type_b (Request_chord::static_name())) - p = new Request_chord_iterator ((Request_chord*) m); - else if (m->is_type_b (Chord::static_name())) - p = new Chord_iterator ((Chord*) m); - else if (m->is_type_b (Voice::static_name())) - p = new Voice_iterator ((Voice*) m); - - if (m -> type_str_ != "") - { - Translator * a =report_l-> - find_get_translator_l (m-> type_str_, m->id_str_); - p->set_translator (a); - } + 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; +} + +Music_iterator* +Music_iterator::try_music_in_children (Music *) const +{ + return 0; +} +IMPLEMENT_CTOR_CALLBACK (Music_iterator); - if (! p->report_to_l()) - p ->set_translator (report_l); +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->report_to()) + scm_gc_mark (mus->report_to()->self_scm()); + if (mus->music_) + scm_gc_mark (mus->music_->self_scm()); - return p; + + return SCM_EOL; } -Music_iterator* -Music_iterator::get_iterator_p (Music*m) const +int +Music_iterator::print_smob (SCM sm , SCM port, scm_print_state*) { - Music_iterator*p = static_get_iterator_p (m,report_to_l()); - p->daddy_iter_l_ = (Music_iterator*)this; - p->construct_children(); - return p; + char s[1000]; + + Music_iterator *iter = unsmob_iterator (sm); + sprintf (s, "#<%s>", classname (iter)); + scm_puts (s, port); + return 1; } -Music_iterator::Music_iterator() +void +Music_iterator::derived_mark()const +{ +} + +void +Music_iterator::quit () { - daddy_iter_l_ =0; - first_b_ = true; + do_quit (); + handle_.quit (); } +void +Music_iterator::do_quit() +{ +}