X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fmusic-iterator.cc;h=ce824968a9b1d3242c8dd582c77a7ad4e749ac8d;hb=e09265d8e9ad94714076ca91e63eab5c55679286;hp=6e15c4b1671e5d92d6374db5627e1ecc7a7c8063;hpb=e24df7c27635dc996c466295eacf2981bddccaf7;p=lilypond.git

diff --git a/lily/music-iterator.cc b/lily/music-iterator.cc
index 6e15c4b167..ce824968a9 100644
--- a/lily/music-iterator.cc
+++ b/lily/music-iterator.cc
@@ -3,19 +3,20 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-/*
-  UGH. too many includes.
- */
 
 #include "music-iterator.hh"
 
 #include <cstdio>
+using namespace std;
 
 #include "warn.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"
@@ -28,7 +29,7 @@ Music_iterator::Music_iterator ()
   smobify_self ();
 }
 
-Music_iterator::Music_iterator (Music_iterator const& )
+Music_iterator::Music_iterator (Music_iterator const &)
 {
   assert (false);
 }
@@ -37,7 +38,7 @@ Music_iterator::~Music_iterator ()
 {
 }
 
-Context * 
+Context *
 Music_iterator::get_outlet () const
 {
   return handle_.get_outlet ();
@@ -71,16 +72,14 @@ 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);
@@ -89,22 +88,23 @@ 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;
 
       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 +118,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);
@@ -131,11 +131,11 @@ Music_iterator::substitute_outlet (Context *f, Context *t)
 {
   if (get_outlet () == f)
     set_context (t);
-  derived_substitute (f,t);
+  derived_substitute (f, t);
 }
 
 void
-Music_iterator::derived_substitute (Context *,Context *)
+Music_iterator::derived_substitute (Context *, Context *)
 {
 }
 
@@ -143,33 +143,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_iterator (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 (_f ("Sending non-event to context"));
+
+  m->send_to_context (get_outlet ());
 }
 
 IMPLEMENT_CTOR_CALLBACK (Music_iterator);
@@ -189,29 +191,28 @@ IMPLEMENT_DEFAULT_EQUAL_P (Music_iterator);
 SCM
 Music_iterator::mark_smob (SCM smob)
 {
-  Music_iterator * mus = (Music_iterator *)SCM_CELL_WORD_1 (smob);
+  Music_iterator *mus = (Music_iterator *)SCM_CELL_WORD_1 (smob);
 
   mus->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 ());
-  
 
   return SCM_EOL;
 }
 
 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];
 
   Music_iterator *iter = unsmob_iterator (sm);
-  sprintf (s, "#<%s>", classname (iter));
+  sprintf (s, "#<%s>", iter->class_name ());
   scm_puts (s, port);
   return 1;
 }
@@ -225,7 +226,7 @@ void
 Music_iterator::quit ()
 {
   do_quit ();
-  handle_.quit ();
+  handle_.set_context (0);
 }
 
 void
@@ -239,26 +240,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);
 }