X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fmusic-iterator.hh;h=86b3bf379a0127d8dd1b300e9b608f1e2971dc15;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=29d67bbeb885b762e7e7ce1230a087995599e822;hpb=bd24b8ad63e7825f8e85cf772cd1a17b2a99b9dc;p=lilypond.git

diff --git a/lily/include/music-iterator.hh b/lily/include/music-iterator.hh
index 29d67bbeb8..86b3bf379a 100644
--- a/lily/include/music-iterator.hh
+++ b/lily/include/music-iterator.hh
@@ -3,13 +3,13 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2008 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 "context-handle.hh"
@@ -53,20 +53,22 @@ protected:
   Moment music_length_;
   Moment start_mom_;
 
-  DECLARE_SMOBS (Music_iterator, dummy);
+  DECLARE_CLASSNAME(Music_iterator);
+  DECLARE_SMOBS (Music_iterator);
   Music_iterator (Music_iterator const &);
 
 public:
   Moment music_get_length () const;
   Moment music_start_mom () const;
   Music_iterator ();
-  Music_iterator *try_music (Music *) const;
+  void report_event (Music *);
   Context *get_outlet () const;
   void set_context (Context *);
   static SCM get_static_get_iterator (Music *mus);
-  void init_translator (Music *, Context *);
+  void init_context (Music *, Context *);
   void quit ();
   void substitute_outlet (Context *from, Context *to);
+  void descend_to_bottom_context ();
   virtual void derived_substitute (Context *, Context *);
   virtual Moment pending_moment () const;
   virtual bool ok () const;
@@ -77,8 +79,6 @@ public:
   DECLARE_SCHEME_CALLBACK (constructor, ());
   SCM get_iterator (Music *) const;
 
-  virtual Music_iterator *try_music_in_children (Music *) const;
-
   Music *get_music () const;
 protected:
   virtual void do_quit ();
@@ -92,14 +92,14 @@ private:
 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);