X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic-iterator.cc;h=789b2b243c87fd9dd704b482dd2bf77f8822ddd6;hb=419ab1be077ad383bc5a3eda3c3e982507ab3e17;hp=b016e6e5aaea52b1099198446ec2e6ffbde426ed;hpb=0d3c78505a6adb958f9280509bb7fa170de54611;p=lilypond.git

diff --git a/lily/music-iterator.cc b/lily/music-iterator.cc
index b016e6e5aa..789b2b243c 100644
--- a/lily/music-iterator.cc
+++ b/lily/music-iterator.cc
@@ -3,19 +3,19 @@
 
   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"
@@ -87,6 +87,8 @@ Music_iterator::get_static_get_iterator (Music *m)
     {
       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;
 
@@ -115,7 +117,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);
@@ -142,30 +144,33 @@ 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 ());
+  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);
@@ -206,7 +211,7 @@ 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;
 }
@@ -238,9 +243,7 @@ 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;
 }