X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fmusic-iterator.hh;h=0b738aa0b338569bf7409d3a04c4606c6650a963;hb=8347f6f06cd4c56d7a2d2ec482647afaaade1267;hp=7b395e8a2c49c55e9a1d12175a4a5112d7aefee7;hpb=58bcc84c9480dae1b21bc24d8396b91fe19e0131;p=lilypond.git

diff --git a/lily/include/music-iterator.hh b/lily/include/music-iterator.hh
index 7b395e8a2c..0b738aa0b3 100644
--- a/lily/include/music-iterator.hh
+++ b/lily/include/music-iterator.hh
@@ -3,16 +3,16 @@
 
   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>
 */
 
 #ifndef MUSIC_ITERATOR_HH
 #define MUSIC_ITERATOR_HH
 
-#include "array.hh"
+#include "std-vector.hh"
 #include "moment.hh"
 #include "virtual-methods.hh"
-#include "interpretation-context-handle.hh"
+#include "context-handle.hh"
 
 /**
    ---
@@ -53,30 +53,17 @@ protected:
   Moment music_length_;
   Moment start_mom_;
 
+  DECLARE_CLASSNAME(Music_iterator);
   DECLARE_SMOBS (Music_iterator, dummy);
   Music_iterator (Music_iterator const &);
-public:
 
+public:
   Moment music_get_length () const;
   Moment music_start_mom () const;
   Music_iterator ();
-
-  /**
-     Do the reporting.  Will try MUSIC_L_ in its own translator first,
-     then its children. Returns the iterator that succeeded
-  */
   Music_iterator *try_music (Music *) const;
-
-  /**
-     The translation unit that we this iterator is reporting  to now.
-  */
   Context *get_outlet () const;
-
   void set_context (Context *);
-
-  /** Get an iterator matching the type of MUS, and use TRANS to find
-      an accompanying translation unit
-  */
   static SCM get_static_get_iterator (Music *mus);
   void init_translator (Music *, Context *);
   void quit ();
@@ -84,22 +71,11 @@ public:
   virtual void derived_substitute (Context *, Context *);
   virtual Moment pending_moment () const;
   virtual bool ok () const;
-
   virtual bool run_always () const;
   virtual void process (Moment until);
   virtual void derived_mark () const;
   virtual void construct_children ();
-
-  /**
-     Construct sub-iterators, and set the translator to
-     report to.
-  */
-
   DECLARE_SCHEME_CALLBACK (constructor, ());
-
-  /**
-     Get an iterator for MUS, inheriting the translation unit from THIS.
-  */
   SCM get_iterator (Music *) const;
 
   virtual Music_iterator *try_music_in_children (Music *) const;
@@ -108,22 +84,23 @@ public:
 protected:
   virtual void do_quit ();
   void descend_to_child (Context *);
+
 private:
-  Interpretation_context_handle handle_;
+  Context_handle handle_;
   Music *music_;
 };
 
 bool is_child_context (Context *me, Context *child);
 
 #define IMPLEMENT_CTOR_CALLBACK(Class)					\
-  LY_DEFINE_MEMBER_FUNCTION (Class, constructor, #Class "::constructor", \
+  LY_DEFINE_MEMBER_FUNCTION (Class, constructor, \
+			     mangle_cxx_identifier (string (#Class) + "::constructor").c_str(), \
 			     0, 0, 0,					\
 			     (),					\
 			     "")					\
   {									\
-    SCM val = (new Class)->self_scm ();					\
-    scm_gc_unprotect_object (val);					\
-    return val;								\
+    Class *c = (new Class);						\
+    return c->unprotect ();						\
   }
 
 DECLARE_UNSMOB (Music_iterator, iterator);