* lily/include/sequential-iterator.hh (class Sequential_iterator):

don't use Protected_scm for music-iterator members.

* lily/music-iterator.cc (Music_iterator): initialize music_

diff --git a/ChangeLog b/ChangeLog
index 1c263d068504135e2140e132fa5ec14053f458b0..0c976568ce5c94280a52d8fe70a46e2aa0db8f97 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,11 @@
+2002-09-10  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
+
+       * lily/include/sequential-iterator.hh (class Sequential_iterator):
+       don't use Protected_scm for music-iterator members. 
+
+       * lily/music-iterator.cc (Music_iterator): initialize music_
        
+
 2002-09-09  Juergen Reuter  <reuter@ipd.uka.de>
 
        * input/test/accid.ly: updated test file to show all available

diff --git a/lily/include/sequential-iterator.hh b/lily/include/sequential-iterator.hh
index 554e3657c2d3d761553aa571c41c0546fbde65af..efdc5634ea177defdea8b81ae57865958ee88c64 100644 (file)
--- a/lily/include/sequential-iterator.hh
+++ b/lily/include/sequential-iterator.hh
@@ -73,7 +73,7 @@ protected:
 protected:
   Moment here_mom_;
   Music_iterator * iter_;
-  Protected_scm  list_;
+  SCM  list_;
   SCM cursor_;
   
   virtual void next_element (bool side_effect);

diff --git a/lily/music-iterator.cc b/lily/music-iterator.cc
index d4ea1f1b96ffbfe8625edca96b47f28872940e10..bf8216ff4b3b47fca1c1e9d7fef31b809f0c80e9 100644 (file)
--- a/lily/music-iterator.cc
+++ b/lily/music-iterator.cc
@@ -21,6 +21,7 @@
 
 Music_iterator::Music_iterator ()
 {
+  music_ = 0;
   smobify_self ();
 }
 

diff --git a/lily/sequential-iterator.cc b/lily/sequential-iterator.cc
index 95bd2729f181d453617286f7ef6d86debfa1f761..edd5ab5ee80aa3d93f13dd20e221c1c75edc1fbe 100644 (file)
--- a/lily/sequential-iterator.cc
+++ b/lily/sequential-iterator.cc
@@ -77,6 +77,7 @@ Sequential_iterator::derived_mark ()const
 {
   if (iter_)
     scm_gc_mark (iter_->self_scm());
+  scm_gc_mark (list_);
 }