(class Music_iterator): change

get_music() to get_pending_events().

diff --git a/ChangeLog b/ChangeLog
index 094116f544c99e56bae10ff24bcdea356c81a6e0..0688efe389d388bda862f6761cf362dc0ba12ee2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-07-25  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
+
+       * lily/include/music-iterator.hh (class Music_iterator): change
+       get_music() to get_pending_events().
+
 2002-07-25  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * buildscripts/ontgaar.py: get_music () -> get_pending_events ().

diff --git a/lily/auto-change-iterator.cc b/lily/auto-change-iterator.cc
index 56f18919058633d629ce31107532a6574a4f8ca5..bed3c0264d8d0ea3481cfd7cdf9044a629c7c9b4 100644 (file)
--- a/lily/auto-change-iterator.cc
+++ b/lily/auto-change-iterator.cc
@@ -84,7 +84,7 @@ Auto_change_iterator::pending_pitch (Moment m) const
   Array<Pitch> ps;
   while (1)
     {
-      SCM muses = iter->get_music (m);
+      SCM muses = iter->get_pending_events (m);
       for (SCM s = muses; gh_pair_p (s); s=ly_cdr (s))
        if (Note_req* nr = dynamic_cast<Note_req*> (unsmob_music (ly_car (s))))
          {

diff --git a/lily/folded-repeat-iterator.cc b/lily/folded-repeat-iterator.cc
index ec30d1b5485030e0e96875183893146859f3ebe9..2fff7f1127c1abd43d14f2dff30d5f419515050c 100644 (file)
--- a/lily/folded-repeat-iterator.cc
+++ b/lily/folded-repeat-iterator.cc
@@ -10,7 +10,7 @@
 
 /*
    Folded repeats are a stupid idea at this point, so we refrain from
-   implementing get_music () and skip ().
+   implementing get_pending_events () and skip ().
 */
 
 #include "folded-repeat-iterator.hh"

diff --git a/lily/include/music-constructor.hh b/lily/include/music-constructor.hh
index 587db25680fdb9ca809bc740f5f28b7bf6cbc548..1e9dc262ff0f83419a75313251367db12fc56029 100644 (file)
--- a/lily/include/music-constructor.hh
+++ b/lily/include/music-constructor.hh
@@ -25,7 +25,7 @@ static void  _ ## type ## _adder () {\
 ADD_GLOBAL_CTOR (_ ## type ## _adder);
 
 void add_music_ctor (String, Music* (*) ());
-Music*get_music (String);
+Music*make_music (String);
 
 
 

diff --git a/lily/include/music-iterator.hh b/lily/include/music-iterator.hh
index 6d1bfe878bd0021f469e121fbb10c04086c251bf..25f6a93ebb4545438fdd134317e384f388aacb35 100644 (file)
--- a/lily/include/music-iterator.hh
+++ b/lily/include/music-iterator.hh
@@ -45,7 +45,7 @@
     * Typically this reports the music to an interpretation context,
     thus changing the state of the interpretation context.
 
-  get_music (M) -- return all events starting at M (pre: no events
+  get_pending_events (M) -- return all events starting at M (pre: no events
     before M). No side-effects
 
   skip (M) -- remove all events starting before M (leave the ones that
@@ -92,7 +92,7 @@ public:
 
   virtual Moment pending_moment () const;
   virtual bool ok () const;
-  virtual SCM get_music (Moment until)const;
+  virtual SCM get_pending_events (Moment until)const;
   virtual void process (Moment until);
   virtual void skip (Moment until);
 

diff --git a/lily/include/music-wrapper-iterator.hh b/lily/include/music-wrapper-iterator.hh
index 2c9b2594972072ec0857a4646d7ffe22d754c3a6..62f60b272a53a138875ae1c9d2e1dd69779f9499 100644 (file)
--- a/lily/include/music-wrapper-iterator.hh
+++ b/lily/include/music-wrapper-iterator.hh
@@ -30,7 +30,7 @@ public:
   virtual void construct_children () ;
   virtual Moment pending_moment () const;
   virtual bool ok () const;
-  virtual SCM get_music (Moment)const;
+  virtual SCM get_pending_events (Moment)const;
   virtual void skip (Moment);
 
 protected:

diff --git a/lily/include/part-combine-music-iterator.hh b/lily/include/part-combine-music-iterator.hh
index 9f4799b59d2f386861e4bddaa4a9547de49d7751..dce3f001ff7d8ad2a9a0cc88f9f326c37570b306 100644 (file)
--- a/lily/include/part-combine-music-iterator.hh
+++ b/lily/include/part-combine-music-iterator.hh
@@ -26,7 +26,7 @@ protected:
   virtual void construct_children ();
   virtual Moment pending_moment () const;
   virtual void process (Moment);
-  virtual SCM get_music (Moment)const;
+  virtual SCM get_pending_events (Moment)const;
   virtual Music_iterator *try_music_in_children (Music *) const;
   virtual bool ok () const;
 

diff --git a/lily/include/request-chord-iterator.hh b/lily/include/request-chord-iterator.hh
index b5176178ffb4a86b171a4aa9715c5e932d3177ff..08532a5df442d1fa49a1c43fd26f3ee3eac8261b 100644 (file)
--- a/lily/include/request-chord-iterator.hh
+++ b/lily/include/request-chord-iterator.hh
@@ -35,7 +35,7 @@ public:
   Request_chord_iterator ();
   Request_chord_iterator (Request_chord_iterator const&);
 
-  virtual SCM get_music (Moment) const;
+  virtual SCM get_pending_events (Moment) const;
 protected:
   virtual void process (Moment);
   virtual void construct_children ();

diff --git a/lily/include/sequential-iterator.hh b/lily/include/sequential-iterator.hh
index 13b471ec90cc9893ed98eda7742421cf44bcb281..5749b88fbf8c5491bd49449e5d2a2b68450c1999 100644 (file)
--- a/lily/include/sequential-iterator.hh
+++ b/lily/include/sequential-iterator.hh
@@ -63,7 +63,7 @@ public:
   virtual Moment pending_moment () const;
   virtual bool ok () const;
   virtual void skip (Moment);
-  virtual SCM get_music (Moment)const;
+  virtual SCM get_pending_events (Moment)const;
 
 protected:
   virtual void process (Moment);

diff --git a/lily/include/simultaneous-music-iterator.hh b/lily/include/simultaneous-music-iterator.hh
index 122a4825adb316053695c67b400e7db8fe7be4cb..555a49652b3b913ec77603d633c655d3740f3acb 100644 (file)
--- a/lily/include/simultaneous-music-iterator.hh
+++ b/lily/include/simultaneous-music-iterator.hh
@@ -29,7 +29,7 @@ public:
   virtual void construct_children ();
   virtual Moment pending_moment () const;
   virtual bool ok () const;
-  virtual SCM get_music (Moment)const;
+  virtual SCM get_pending_events (Moment)const;
   virtual void skip (Moment);
 
 protected:

diff --git a/lily/music-constructor.cc b/lily/music-constructor.cc
index b8f3b24209bad677b2c1461b2e71465d88567fdd..51a2497ec6f95e9752418d1d8f16e280e6659084 100644 (file)
--- a/lily/music-constructor.cc
+++ b/lily/music-constructor.cc
@@ -33,7 +33,7 @@ get_music_ctor (String s)
 }
 
 Music* 
-get_music (String s)
+make_music (String s)
 {
   return (*get_music_ctor (s)) () ;
 }

diff --git a/lily/music-iterator.cc b/lily/music-iterator.cc
index 21d3edfd0ae2394c7e05aa1950158cbe2f6328ae..e478c40a0daf7408b3aa4aa7cae95b7acf9d7b05 100644 (file)
--- a/lily/music-iterator.cc
+++ b/lily/music-iterator.cc
@@ -77,7 +77,7 @@ Music_iterator::skip (Moment)
 }
 
 SCM
-Music_iterator::get_music (Moment)const
+Music_iterator::get_pending_events (Moment)const
 {
   return SCM_EOL;
 }

diff --git a/lily/music-wrapper-iterator.cc b/lily/music-wrapper-iterator.cc
index fa628ee6b27950470217e174ae3d1515e01f525f..cf5097245f189fd4e4f059ce92f2991e5d7cc5df 100644 (file)
--- a/lily/music-wrapper-iterator.cc
+++ b/lily/music-wrapper-iterator.cc
@@ -64,9 +64,9 @@ Music_wrapper_iterator::process (Moment m)
 }
 
 SCM
-Music_wrapper_iterator::get_music (Moment m)const
+Music_wrapper_iterator::get_pending_events (Moment m)const
 {
-  return child_iter_p_->get_music (m);
+  return child_iter_p_->get_pending_events (m);
 }
 
 Moment

diff --git a/lily/music.cc b/lily/music.cc
index 22f16ff80a3a77d8f97f0c17fbbe4ad22a3ff07d..a5b8c72b810e6059cce903b46c0145297b02dec6 100644 (file)
--- a/lily/music.cc
+++ b/lily/music.cc
@@ -260,8 +260,7 @@ type does not yet offer many manipulations.
 {
   SCM_ASSERT_TYPE(gh_string_p(type), type, SCM_ARG1, __FUNCTION__, "string");
   
-  
-  SCM s = get_music (ly_scm2string (type))->self_scm ();
+  SCM s = make_music (ly_scm2string (type))->self_scm ();
   scm_gc_unprotect_object (s);
 
   return s;

diff --git a/lily/part-combine-music-iterator.cc b/lily/part-combine-music-iterator.cc
index 82ca27ad39a28750ee75cdd377ee73b1c0a2455f..46c29221e695d11adb368027c480086626f136cf 100644 (file)
--- a/lily/part-combine-music-iterator.cc
+++ b/lily/part-combine-music-iterator.cc
@@ -126,7 +126,7 @@ get_music_info (Moment m, Music_iterator* iter, SCM *pitches, SCM *durations)
 {
   if (iter->ok ())
     {
-      for (SCM i = iter->get_music (m); gh_pair_p (i); i = ly_cdr (i))
+      for (SCM i = iter->get_pending_events (m); gh_pair_p (i); i = ly_cdr (i))
        {
          Music *m = unsmob_music (ly_car (i));
          if (Melodic_req *r = dynamic_cast<Melodic_req *> (m))
@@ -438,13 +438,13 @@ Part_combine_music_iterator::try_music_in_children (Music *m) const
 
 
 SCM
-Part_combine_music_iterator::get_music (Moment m)const
+Part_combine_music_iterator::get_pending_events (Moment m)const
 {
   SCM s = SCM_EOL;
   if (first_iter_p_)
-    s = gh_append2 (s,first_iter_p_->get_music (m));
+    s = gh_append2 (s,first_iter_p_->get_pending_events (m));
   if (second_iter_p_)
-    s = gh_append2 (second_iter_p_->get_music (m),s);
+    s = gh_append2 (second_iter_p_->get_pending_events (m),s);
   return s;
 }
 

diff --git a/lily/request-chord-iterator.cc b/lily/request-chord-iterator.cc
index 2a23dba32c46b1113c89a0c2b32567e59a9ee9bd..f70602fdfbbb42dfc0c9641982dafbae894bba19 100644 (file)
--- a/lily/request-chord-iterator.cc
+++ b/lily/request-chord-iterator.cc
@@ -46,7 +46,7 @@ Request_chord_iterator::elt_l () const
 }
 
 SCM
-Request_chord_iterator::get_music (Moment) const
+Request_chord_iterator::get_pending_events (Moment) const
 {
   SCM s = SCM_EOL;
   if (last_processed_mom_ < Moment (0))

diff --git a/lily/sequential-iterator.cc b/lily/sequential-iterator.cc
index de12d9362e33bf805e6799abfd96ae95de258106..1668af4d59847a97becf6d0c03c63e8baa9b66d8 100644 (file)
--- a/lily/sequential-iterator.cc
+++ b/lily/sequential-iterator.cc
@@ -24,14 +24,14 @@ Grace_fixup *get_grace_fixups (SCM cursor);
 /*
 
   TODO: the grace note handling hasn't been done for skip() and
-  get_music(), meaning that staff-switching and partcombining will be
+  get_pending_events(), meaning that staff-switching and partcombining will be
   broken with grace notes.
   
  */
 /*
 
   TODO: the grace note handling hasn't been done for skip() and
-  get_music(), meaning that staff-switching and partcombining will be
+  get_pending_events(), meaning that staff-switching and partcombining will be
   broken with grace notes.
   
  */
@@ -232,7 +232,7 @@ Sequential_iterator::descend_to_child ()
 */
 
 SCM
-Sequential_iterator::get_music (Moment until)const
+Sequential_iterator::get_pending_events (Moment until)const
 {
   SCM s = SCM_EOL;
   if (until <  pending_moment ())
@@ -242,7 +242,7 @@ Sequential_iterator::get_music (Moment until)const
     dynamic_cast<Sequential_iterator*> (clone ());
   while (me->ok ())
     {
-      SCM nm = me->iter_p_->get_music (until - me->here_mom_);
+      SCM nm = me->iter_p_->get_pending_events (until - me->here_mom_);
       s = gh_append2 (nm, s);
       
       Moment m = 0;

diff --git a/lily/simultaneous-music-iterator.cc b/lily/simultaneous-music-iterator.cc
index cc246f8a48a70f3c6e3125e828f60e9d113f9f55..f496b6378484f975c025f77d0df91051991a737c 100644 (file)
--- a/lily/simultaneous-music-iterator.cc
+++ b/lily/simultaneous-music-iterator.cc
@@ -35,12 +35,12 @@ Simultaneous_music_iterator::~Simultaneous_music_iterator ()
 }
 
 SCM
-Simultaneous_music_iterator::get_music (Moment m)const
+Simultaneous_music_iterator::get_pending_events (Moment m)const
 {
   SCM s = SCM_EOL;
   for (Cons<Music_iterator> *p = children_p_list_.head_; p; p = p->next_)
     {
-      s = gh_append2 (p->car_->get_music (m), s);
+      s = gh_append2 (p->car_->get_pending_events (m), s);
     }
   return s;
 }