X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic-iterator.cc;h=c875b060a565b1db6cf9bd8d15ac43a17acee364;hb=0b544cfb7332615ef809b71b57ab656741311ae1;hp=6b29d2bc2f9205b9b74b66e9745fd091733c7e64;hpb=cfbe7661413b152a10293f3da7fb412e325254f9;p=lilypond.git

diff --git a/lily/music-iterator.cc b/lily/music-iterator.cc
index 6b29d2bc2f..c875b060a5 100644
--- a/lily/music-iterator.cc
+++ b/lily/music-iterator.cc
@@ -1,22 +1,31 @@
 /*
-  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--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.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"
@@ -41,7 +50,7 @@ Music_iterator::~Music_iterator ()
 Context *
 Music_iterator::get_outlet () const
 {
-  return handle_.get_outlet ();
+  return handle_.get_context ();
 }
 
 void
@@ -87,9 +96,11 @@ Music_iterator::get_static_get_iterator (Music *m)
   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 ();
@@ -116,7 +127,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);
@@ -143,30 +154,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);
@@ -202,7 +216,7 @@ Music_iterator::mark_smob (SCM smob)
 }
 
 int
-Music_iterator::print_smob (SCM sm, SCM port, scm_print_state*)
+Music_iterator::print_smob (SCM sm, SCM port, scm_print_state *)
 {
   char s[1000];