X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic-iterator.cc;h=326b97502886559ab3140f6e07f1c2573ecbcd77;hb=41c3f00570245a84ded4c2cdff354cb97aa3e21c;hp=ea8e73434931215bbe4ccb83c4d2dd4886642cef;hpb=94a1966c72301b8bd1d8bb3b8628c3f089d007cf;p=lilypond.git

diff --git a/lily/music-iterator.cc b/lily/music-iterator.cc
index ea8e734349..326b975028 100644
--- a/lily/music-iterator.cc
+++ b/lily/music-iterator.cc
@@ -3,16 +3,16 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-/*
-  UGH. too many includes.
- */
-#include <stdio.h>
 
-#include "warn.hh"
 #include "music-iterator.hh"
+
+#include <cstdio>
+using namespace std;
+
+#include "warn.hh"
 #include "context.hh"
 #include "music-wrapper.hh"
 #include "music-wrapper-iterator.hh"
@@ -26,7 +26,7 @@ Music_iterator::Music_iterator ()
   smobify_self ();
 }
 
-Music_iterator::Music_iterator (Music_iterator const& )
+Music_iterator::Music_iterator (Music_iterator const &)
 {
   assert (false);
 }
@@ -35,16 +35,16 @@ Music_iterator::~Music_iterator ()
 {
 }
 
-Context * 
+Context *
 Music_iterator::get_outlet () const
 {
   return handle_.get_outlet ();
 }
 
 void
-Music_iterator::set_translator (Context *trans)
+Music_iterator::set_context (Context *trans)
 {
-  handle_.set_translator (trans);
+  handle_.set_context (trans);
 }
 
 void
@@ -69,16 +69,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_procedure_p (ctor))
+  if (ly_is_procedure (ctor))
     {
       iter = scm_call_0 (ctor);
       p = unsmob_iterator (iter);
@@ -91,18 +89,17 @@ Music_iterator::get_static_get_iterator (Music *m)
 	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
 {
@@ -121,19 +118,19 @@ Music_iterator::init_translator (Music *m, Context *report)
   music_ = m;
   assert (m);
   if (! get_outlet ())
-    set_translator (report);
+    set_context (report);
 }
 
 void
 Music_iterator::substitute_outlet (Context *f, Context *t)
 {
   if (get_outlet () == f)
-    set_translator (t);
-  derived_substitute (f,t);
+    set_context (t);
+  derived_substitute (f, t);
 }
 
 void
-Music_iterator::derived_substitute (Context *,Context *)
+Music_iterator::derived_substitute (Context *, Context *)
 {
 }
 
@@ -141,10 +138,10 @@ SCM
 Music_iterator::get_iterator (Music *m) const
 {
   SCM ip = get_static_get_iterator (m);
-  Music_iterator*p = unsmob_iterator (ip);
-  
+  Music_iterator *p = unsmob_iterator (ip);
+
   p->init_translator (m, get_outlet ());
-  
+
   p->construct_children ();
   return ip;
 }
@@ -152,19 +149,18 @@ Music_iterator::get_iterator (Music *m) const
 /*
   TODO: rename to prevent confusion between Context::try_music and
   Iterator::try_music
-  
- */
-Music_iterator*
+*/
+Music_iterator *
 Music_iterator::try_music (Music *m) const
 {
-  bool b = get_outlet ()->try_music ((Music*)m); // ugh
-  Music_iterator * it = b ? (Music_iterator*) this : 0;	// ugh
+  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;
 }
 
-Music_iterator*
+Music_iterator *
 Music_iterator::try_music_in_children (Music *) const
 {
   return 0;
@@ -187,29 +183,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;
 }
@@ -223,7 +218,7 @@ void
 Music_iterator::quit ()
 {
   do_quit ();
-  handle_.quit ();
+  handle_.set_context (0);
 }
 
 void
@@ -237,26 +232,23 @@ Music_iterator::run_always ()const
   return false;
 }
 
-
 bool
 is_child_context (Context *me, Context *child)
 {
   while (child && child != me)
-    {
-      child = child->daddy_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_translator (child_report);
+    set_context (child_report);
 }