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

diff --git a/lily/include/music-iterator.hh b/lily/include/music-iterator.hh
index 29d67bbeb8..2afa31941a 100644
--- a/lily/include/music-iterator.hh
+++ b/lily/include/music-iterator.hh
@@ -1,15 +1,26 @@
 /*
-  music-iterator.hh -- declare Music_iterator
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2015 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.
+
+  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.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #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"
@@ -47,26 +58,33 @@
 
    merge pending_moment and process?
 */
-class Music_iterator
+class Music_iterator : public Smob<Music_iterator>
 {
+public:
+  int print_smob (SCM, scm_print_state *);
+  SCM mark_smob ();
+  static const char type_p_name_[];
+  virtual ~Music_iterator ();
 protected:
   Moment music_length_;
   Moment start_mom_;
 
-  DECLARE_SMOBS (Music_iterator, dummy);
-  Music_iterator (Music_iterator const &);
+  DECLARE_CLASSNAME (Music_iterator);
+private:
+  Music_iterator (Music_iterator const &); // Do not define!  Not copyable!
 
 public:
   Moment music_get_length () const;
   Moment music_start_mom () const;
   Music_iterator ();
-  Music_iterator *try_music (Music *) const;
-  Context *get_outlet () const;
-  void set_context (Context *);
+  void report_event (Music *);
+  virtual Context *get_outlet () const;
+  virtual 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 +95,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 ();
@@ -91,17 +107,16 @@ private:
 
 bool is_child_context (Context *me, Context *child);
 
-#define IMPLEMENT_CTOR_CALLBACK(Class)					\
-  LY_DEFINE_MEMBER_FUNCTION (Class, constructor, #Class "::constructor", \
-			     0, 0, 0,					\
-			     (),					\
-			     "")					\
-  {									\
-    SCM val = (new Class)->self_scm ();					\
-    scm_gc_unprotect_object (val);					\
-    return val;								\
+#define IMPLEMENT_CTOR_CALLBACK(Class)                                  \
+  LY_DEFINE_MEMBER_FUNCTION (Class, constructor, \
+                             mangle_cxx_identifier (string (#Class) + "::constructor").c_str(), \
+                             0, 0, 0,                                   \
+                             (),                                        \
+                             "")                                        \
+  {                                                                     \
+    Class *c = (new Class);                                             \
+    return c->unprotect ();                                             \
   }
 
-DECLARE_UNSMOB (Music_iterator, iterator);
 
 #endif // MUSIC_ITERATOR_HH