/*
- 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 <hanwen@xs4all.nl>
- (c) 1997--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
-*/
+ 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 <http://www.gnu.org/licenses/>.
+*/
#include <cstdio>
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 ()
{
smobify_self ();
}
-Music_iterator::Music_iterator (Music_iterator const &)
-{
- assert (false);
-}
-
Music_iterator::~Music_iterator ()
{
}
Context *
Music_iterator::get_outlet () const
{
- return handle_.get_outlet ();
+ return handle_.get_context ();
}
void
if (ly_is_procedure (ctor))
{
iter = scm_call_0 (ctor);
- p = unsmob_iterator (iter);
+ p = unsmob<Music_iterator> (iter);
}
else
{
if (dynamic_cast<Music_wrapper *> (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 ();
p->unprotect ();
}
void
-Music_iterator::init_translator (Music *m, Context *report)
+Music_iterator::init_context (Music *m, Context *report)
{
music_ = m;
assert (m);
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::get_iterator (Music *m) const
{
SCM ip = get_static_get_iterator (m);
- Music_iterator *p = unsmob_iterator (ip);
+ Music_iterator *p = unsmob<Music_iterator> (ip);
- p->init_translator (m, get_outlet ());
+ 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);
/****************************************************************/
-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>", iter->class_name ());
+ sprintf (s, "#<%s>", class_name ());
scm_puts (s, port);
return 1;
}
projects / lilypond.git / blobdiff