source file of the GNU LilyPond music typesetter
- (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
-/*
- UGH. too many includes.
-*/
-
-#include "music-iterator.hh"
#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"
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);
{
if (dynamic_cast<Music_wrapper *> (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);
+ p->unprotect ();
}
p->music_ = m;
}
void
-Music_iterator::init_translator (Music *m, Context *report)
+Music_iterator::init_context (Music *m, Context *report)
{
music_ = m;
assert (m);
SCM ip = get_static_get_iterator (m);
Music_iterator *p = unsmob_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);
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;
}
Music_iterator::quit ()
{
do_quit ();
- handle_.quit ();
+ handle_.set_context (0);
}
void
is_child_context (Context *me, Context *child)
{
while (child && child != me)
- {
- child = child->get_parent_context ();
- }
+ child = child->get_parent_context ();
return child == me;
}