* 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_

diff --git a/ChangeLog b/ChangeLog
index 2d776618e2c60c3d3f89bf2572f60d9b5b8ee0da..9191077ff5b7b8cb74f4917d485253fedd67e331 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 2002-09-15  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
+       * 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 198b47152d5b8e8cde0406d5b3e713342f70a459..f922492dea12c4dc91067436ed62f7f37aff0e17 100644 (file)
--- 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 73c7ae792433be29eef180490fcd4a1c478866ef..11a0a75bff81af93b5212ab183a13e0b8df09290 100644 (file)
--- 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 d1bdfb1f9b7d9cabb9a4cc11e143768b8e12bfb6..cc9c112ad8cbd150cf4e6d781e42617241d1fbe8 100644 (file)
--- 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 9424e84d2d8103fa92b9aa46e57b3b155c9c31f4..6817d3a0d5c71c7f95cd85f6d5d22683a8aa988d 100644 (file)
--- 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 7b9522790bfab482dc1bad2396b1f1bff4087178..957b7bb628ba6ef388413702ae520ccc18159c30 100644 (file)
--- 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 7575993e64c25203898cb2ed8cf383b518f6c5f0..795536e68f48ea9679a8a8de331e109e93735035 100644 (file)
--- 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 28dfc9dc9e9f7ea602d2344dd1fa277194074143..72f3635608a29caaf610fcc018aa144b930d4e80 100644 (file)
--- 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
+       ))