X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic-iterator.cc;h=a7a06ff0d82a1ba88ac1f1a67a4346f2fc00ceb0;hb=a6a51abfd0195a3cf7d6ea095cf69808852f21ce;hp=e6fbf64304f0b1329ffcc96f90c4087838674877;hpb=163225c0cbb1055dfd3614615350ab9f3aaba74c;p=lilypond.git diff --git a/lily/music-iterator.cc b/lily/music-iterator.cc index e6fbf64304..a7a06ff0d8 100644 --- a/lily/music-iterator.cc +++ b/lily/music-iterator.cc @@ -1,26 +1,35 @@ /* - music-iterator.cc -- implement Music_iterator + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 1997--2015 Han-Wen Nienhuys - (c) 1997--2004 Han-Wen Nienhuys -*/ + LilyPond is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. -/* - UGH. too many includes. - */ + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. -#include "music-iterator.hh" + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . +*/ #include +using namespace std; #include "warn.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 "ly-smobs.icc" Music_iterator::Music_iterator () { @@ -28,19 +37,14 @@ Music_iterator::Music_iterator () smobify_self (); } -Music_iterator::Music_iterator (Music_iterator const& ) -{ - assert (false); -} - Music_iterator::~Music_iterator () { } -Context * +Context * Music_iterator::get_outlet () const { - return handle_.get_outlet (); + return handle_.get_context (); } void @@ -71,40 +75,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_property ("iterator-ctor") ; + SCM ctor = m->get_property ("iterator-ctor"); SCM iter = SCM_EOL; - if (ly_c_procedure_p (ctor)) + if (ly_is_procedure (ctor)) { iter = scm_call_0 (ctor); - p = unsmob_iterator (iter); + p = unsmob (iter); } else { if (dynamic_cast (m)) - p = new Music_wrapper_iterator; + p = new Music_wrapper_iterator; + else if (m->is_mus_type ("event")) + p = new Event_iterator; else - p = new Simple_music_iterator; + p = new Simple_music_iterator; iter = p->self_scm (); - scm_gc_unprotect_object (iter); + 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 { @@ -118,7 +121,7 @@ Music_iterator::music_start_mom ()const } void -Music_iterator::init_translator (Music *m, Context *report) +Music_iterator::init_context (Music *m, Context *report) { music_ = m; assert (m); @@ -129,13 +132,16 @@ Music_iterator::init_translator (Music *m, Context *report) void Music_iterator::substitute_outlet (Context *f, Context *t) { - if (get_outlet () == f) - set_context (t); - derived_substitute (f,t); + if (f != t) + { + if (get_outlet () == f) + set_context (t); + derived_substitute (f, t); + } } void -Music_iterator::derived_substitute (Context *,Context *) +Music_iterator::derived_substitute (Context *, Context *) { } @@ -143,33 +149,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 (ip); + + p->init_context (m, get_outlet ()); + p->construct_children (); return ip; } -/* - TODO: rename to prevent confusion between Context::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); @@ -182,36 +190,33 @@ Music_iterator::get_music () const /****************************************************************/ -IMPLEMENT_TYPE_P (Music_iterator, "ly:iterator?"); -IMPLEMENT_SMOBS (Music_iterator); -IMPLEMENT_DEFAULT_EQUAL_P (Music_iterator); +const char * const Music_iterator::type_p_name_ = "ly:iterator?"; SCM -Music_iterator::mark_smob (SCM smob) +Music_iterator::mark_smob () const { - Music_iterator * mus = (Music_iterator *)SCM_CELL_WORD_1 (smob); - - mus->derived_mark (); + 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 ()); - + */ + /* Use handle_ directly as get_outlet is a virtual function and we + need to protect the context until Music_iterator::quit is being + run. */ + if (handle_.get_context ()) + scm_gc_mark (handle_.get_context ()->self_scm ()); + if (music_) + scm_gc_mark (music_->self_scm ()); return SCM_EOL; } int -Music_iterator::print_smob (SCM sm , SCM port, scm_print_state*) +Music_iterator::print_smob (SCM port, scm_print_state *) const { char s[1000]; - Music_iterator *iter = unsmob_iterator (sm); - sprintf (s, "#<%s>", classname (iter)); + sprintf (s, "#<%s>", class_name ()); scm_puts (s, port); return 1; } @@ -225,7 +230,7 @@ void Music_iterator::quit () { do_quit (); - handle_.quit (); + handle_.set_context (0); } void @@ -239,26 +244,23 @@ Music_iterator::run_always ()const return false; } - bool is_child_context (Context *me, Context *child) { while (child && child != me) - { - child = child->get_parent_context (); - } - + 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) +Music_iterator::descend_to_child (Context *child_report) { - Context * me_report = get_outlet (); + Context *me_report = get_outlet (); if (is_child_context (me_report, child_report)) set_context (child_report); }