X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fmusic-iterator.hh;h=436318bd385dcda8effd8801147c0660c8101825;hb=5bbfc22fce036b9b69df5e420de93e11da23c05e;hp=89619297dd1d219d3c389f8868f7e88beb3194f9;hpb=373e5ea2a23c1e9e7e916fc95b1dec4c9b8a7503;p=lilypond.git

diff --git a/lily/include/music-iterator.hh b/lily/include/music-iterator.hh
index 89619297dd..436318bd38 100644
--- a/lily/include/music-iterator.hh
+++ b/lily/include/music-iterator.hh
@@ -1,18 +1,29 @@
 /*
-  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--2014 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 "interpretation-context-handle.hh"
+#include "context-handle.hh"
 
 /**
    ---
@@ -53,20 +64,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;
-  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,31 +90,28 @@ 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 ();
   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", \
-			     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