release: 1.0.1

[lilypond.git] / lily / include / music-iterator.hh

diff --git a/lily/include/music-iterator.hh b/lily/include/music-iterator.hh
index 143587be88af2f4efad572c6352ce04e3cd151d1..f5e04126f86630e76c5f251510c5a7fa6db13f78 100644 (file)
--- a/lily/include/music-iterator.hh
+++ b/lily/include/music-iterator.hh
@@ -1,9 +1,9 @@
 /*
-  music-iterator.hh -- declare {Music,Chord,Voice}_iterator
+  music-iterator.hh -- declare Music_iterator
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -12,96 +12,41 @@
 
 #include "lily-proto.hh"
 #include "plist.hh"
-#include "varray.hh"
+#include "array.hh"
 #include "moment.hh"
+#include "virtual-methods.hh"
 
 class Music_iterator {
+  Array<Translator_group*>report_to_l_arr_;
+  void push_translator (Translator_group*);
+  void pop_translator();
 protected:
-    bool first_b_;
-    virtual void do_print()const;
+  bool first_b_;
+  virtual void do_print() const;
     
-public:
-    Music_iterator *daddy_iter_l_;
-    NAME_MEMBERS();
-    Array<Translator *>report_to_l_arr_;
-
-    Translator *report_to_l()const;
-    
-    static Music_iterator* static_get_iterator_p(Music*,Translator*);
-    Music_iterator* get_iterator_p(Music*)const;
-    void set_translator(Translator*);
-    void push_translator(Translator*);
-    void pop_translator();
-
-    
-    Music_iterator();
+  virtual Translator_group* get_req_translator_l();
+  Music_iterator* get_iterator_p (Music*) const;
+  void set_translator (Translator_group*);
+  Music_iterator *daddy_iter_l_;
     
-    virtual void process_and_next(Moment until);
-    virtual Moment next_moment()const;
-    virtual bool ok()const;
-    virtual ~Music_iterator();
-    virtual void construct_children();
-    void print()const;
-    virtual Translator * get_req_translator_l();
-};
-
-class Change_iterator : public Music_iterator {
-    Change_reg * change_l_;
-public:
-     NAME_MEMBERS();
-    virtual void process_and_next(Moment);
-    Change_iterator(Change_reg*);
-};
-
-class Chord_iterator : public Music_iterator
-{
-    const Chord *chord_C_;
-    Pointer_list<Music_iterator*> children_p_list_;
-public:
-    ~Chord_iterator();
-    Chord_iterator(Chord const*);
-    NAME_MEMBERS();
-protected:
-    virtual void do_print()const;
-    virtual void construct_children();
-    virtual void process_and_next(Moment);
-    virtual Moment next_moment()const;
-    virtual bool ok()const;
-};
-
-class Voice_element_iterator : public Music_iterator {
-    const Voice_element * elt_l_;
-    Moment elt_duration_;
-    bool last_b_;
 public:
-    Voice_element_iterator(Voice_element*);
-    NAME_MEMBERS();
-
-protected:
-    virtual void process_and_next(Moment);
-    virtual Moment next_moment()const;
-    virtual void construct_children();
-    virtual bool ok()const;
-    virtual void do_print()const;
-};
-
-
-class Voice_iterator :  private PCursor<Music*>, public Music_iterator
-{
-    Moment here_mom_;
-    const Voice * voice_C_;
-    Music_iterator * iter_p_;
-    void next_element();
-public:
-    Voice_iterator(Voice const*);
-    NAME_MEMBERS();
-protected:
-    virtual void do_print()const;
-    virtual void construct_children();
-    ~Voice_iterator();    
-    virtual void process_and_next(Moment);
-    virtual Moment next_moment()const;
-    virtual bool ok()const;
+  Translator_group*report_to_l() const;
+  DECLARE_MY_RUNTIME_TYPEINFO;
+ 
+  static Music_iterator* static_get_iterator_p (Music*,Translator_group*);
+  Music_iterator();
+    
+  virtual void process_and_next (Moment until);
+  virtual Moment next_moment() const;
+  virtual bool ok() const;
+  virtual ~Music_iterator();
+
+  /**
+    Construct sub-iterators, and set the translator to 
+    report to
+   */
+  virtual void construct_children();
+  void print() const;
 };
 
 #endif // MUSIC_ITERATOR_HH