From d4a1f3d502a2814d46d6602cc62b642337314afc Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Sun, 15 Sep 2002 10:52:49 +0000 Subject: [PATCH] * lily/simultaneous-music-iterator.cc (Simultaneous_music_iterator): init children_list_ * lily/part-combine-music-iterator.cc (Part_combine_music_iterator): init state_ * lily/sequential-iterator.cc (Sequential_iterator): init cursor_ * lily/percent-repeat-iterator.cc (Percent_repeat_iterator): init child_iter_. * lily/sequential-iterator.cc (Sequential_iterator): init list_ --- ChangeLog | 11 +++++++++++ lily/include/simultaneous-music-iterator.hh | 1 - lily/part-combine-music-iterator.cc | 2 ++ lily/percent-repeat-iterator.cc | 4 +++- lily/sequential-iterator.cc | 2 ++ lily/simultaneous-music-iterator.cc | 1 + scm/lily.scm | 1 - scm/music-functions.scm | 14 +++++++++++++- 8 files changed, 32 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2d776618e2..9191077ff5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,16 @@ 2002-09-15 Han-Wen Nienhuys + * lily/simultaneous-music-iterator.cc + (Simultaneous_music_iterator): init children_list_ + + * lily/part-combine-music-iterator.cc + (Part_combine_music_iterator): init state_ + + * lily/sequential-iterator.cc (Sequential_iterator): init cursor_ + + * lily/percent-repeat-iterator.cc (Percent_repeat_iterator): init + child_iter_. + * lily/sequential-iterator.cc (Sequential_iterator): init list_ * lily/translator-def.cc (Translator_def): make a GC proof copy diff --git a/lily/include/simultaneous-music-iterator.hh b/lily/include/simultaneous-music-iterator.hh index 198b47152d..f922492dea 100644 --- a/lily/include/simultaneous-music-iterator.hh +++ b/lily/include/simultaneous-music-iterator.hh @@ -23,7 +23,6 @@ public: /// make a new context for every child. bool separate_contexts_b_; - int cursor_; virtual void construct_children (); virtual Moment pending_moment () const; diff --git a/lily/part-combine-music-iterator.cc b/lily/part-combine-music-iterator.cc index 73c7ae7924..11a0a75bff 100644 --- a/lily/part-combine-music-iterator.cc +++ b/lily/part-combine-music-iterator.cc @@ -20,6 +20,8 @@ Part_combine_music_iterator::Part_combine_music_iterator () second_iter_ = 0; first_until_ = 0; second_until_ = 0; + + state_ = 0; } void diff --git a/lily/percent-repeat-iterator.cc b/lily/percent-repeat-iterator.cc index d1bdfb1f9b..cc9c112ad8 100644 --- a/lily/percent-repeat-iterator.cc +++ b/lily/percent-repeat-iterator.cc @@ -16,13 +16,15 @@ IMPLEMENT_CTOR_CALLBACK (Percent_repeat_iterator); Percent_repeat_iterator::Percent_repeat_iterator () { + child_iter_ = 0; } void Percent_repeat_iterator::do_quit() { - if (child_iter_) child_iter_->quit(); + if (child_iter_) + child_iter_->quit(); } Percent_repeat_iterator::Percent_repeat_iterator (Percent_repeat_iterator const & p) : Music_iterator (p) diff --git a/lily/sequential-iterator.cc b/lily/sequential-iterator.cc index 9424e84d2d..6817d3a0d5 100644 --- a/lily/sequential-iterator.cc +++ b/lily/sequential-iterator.cc @@ -40,6 +40,7 @@ Sequential_iterator::Sequential_iterator () { here_mom_ = Moment (0); list_ = SCM_EOL; + cursor_ = SCM_EOL; grace_fixups_ = 0; iter_ =0; } @@ -77,6 +78,7 @@ Sequential_iterator::derived_mark ()const if (iter_) scm_gc_mark (iter_->self_scm()); scm_gc_mark (list_); + scm_gc_mark (cursor_); } diff --git a/lily/simultaneous-music-iterator.cc b/lily/simultaneous-music-iterator.cc index 7b9522790b..957b7bb628 100644 --- a/lily/simultaneous-music-iterator.cc +++ b/lily/simultaneous-music-iterator.cc @@ -16,6 +16,7 @@ Simultaneous_music_iterator::Simultaneous_music_iterator () { separate_contexts_b_ = false; + children_list_ = SCM_EOL; } Simultaneous_music_iterator::Simultaneous_music_iterator (Simultaneous_music_iterator const& src) diff --git a/scm/lily.scm b/scm/lily.scm index 7575993e64..795536e68f 100644 --- a/scm/lily.scm +++ b/scm/lily.scm @@ -18,7 +18,6 @@ ;(debug-enable 'debug) ;(debug-enable 'backtrace) ;(read-enable 'positions) -;(set-debug-cell-accesses! 15000) diff --git a/scm/music-functions.scm b/scm/music-functions.scm index 28dfc9dc9e..72f3635608 100644 --- a/scm/music-functions.scm +++ b/scm/music-functions.scm @@ -326,4 +326,16 @@ this is not an override ) -(define toplevel-music-functions (list check-start-chords voicify-music)) +;; switch it on here, so parsing and init isn't checked (too slow!) + +(define (switch-on-debugging m) + (set-debug-cell-accesses! 15000) + m + ) + +(define toplevel-music-functions + (list check-start-chords + voicify-music + +; switch-on-debugging + )) -- 2.39.5