From 68bef55db64c48862828fae80cfd24ecb6060efd Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Thu, 25 Jul 2002 16:54:48 +0000 Subject: [PATCH] (class Music_iterator): change get_music() to get_pending_events(). --- ChangeLog | 5 +++++ lily/auto-change-iterator.cc | 2 +- lily/folded-repeat-iterator.cc | 2 +- lily/include/music-constructor.hh | 2 +- lily/include/music-iterator.hh | 4 ++-- lily/include/music-wrapper-iterator.hh | 2 +- lily/include/part-combine-music-iterator.hh | 2 +- lily/include/request-chord-iterator.hh | 2 +- lily/include/sequential-iterator.hh | 2 +- lily/include/simultaneous-music-iterator.hh | 2 +- lily/music-constructor.cc | 2 +- lily/music-iterator.cc | 2 +- lily/music-wrapper-iterator.cc | 4 ++-- lily/music.cc | 3 +-- lily/part-combine-music-iterator.cc | 8 ++++---- lily/request-chord-iterator.cc | 2 +- lily/sequential-iterator.cc | 8 ++++---- lily/simultaneous-music-iterator.cc | 4 ++-- 18 files changed, 31 insertions(+), 27 deletions(-) diff --git a/ChangeLog b/ChangeLog index 094116f544..0688efe389 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2002-07-25 Han-Wen Nienhuys + + * lily/include/music-iterator.hh (class Music_iterator): change + get_music() to get_pending_events(). + 2002-07-25 Jan Nieuwenhuizen * buildscripts/ontgaar.py: get_music () -> get_pending_events (). diff --git a/lily/auto-change-iterator.cc b/lily/auto-change-iterator.cc index 56f1891905..bed3c0264d 100644 --- 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 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 (unsmob_music (ly_car (s)))) { diff --git a/lily/folded-repeat-iterator.cc b/lily/folded-repeat-iterator.cc index ec30d1b548..2fff7f1127 100644 --- 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 587db25680..1e9dc262ff 100644 --- 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 6d1bfe878b..25f6a93ebb 100644 --- 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 2c9b259497..62f60b272a 100644 --- 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 9f4799b59d..dce3f001ff 100644 --- 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 b5176178ff..08532a5df4 100644 --- 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 13b471ec90..5749b88fbf 100644 --- 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 122a4825ad..555a49652b 100644 --- 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 b8f3b24209..51a2497ec6 100644 --- 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 21d3edfd0a..e478c40a0d 100644 --- 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 fa628ee6b2..cf5097245f 100644 --- 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 22f16ff80a..a5b8c72b81 100644 --- 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 82ca27ad39..46c29221e6 100644 --- 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 (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 2a23dba32c..f70602fdfb 100644 --- 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 de12d9362e..1668af4d59 100644 --- 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 (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 cc246f8a48..f496b63784 100644 --- 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 *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; } -- 2.39.5