]> git.donarmstrong.com Git - lilypond.git/blobdiff - lily/music-iterator.cc
* lily/auto-beam-engraver.cc (process_music): end/junk beam if
[lilypond.git] / lily / music-iterator.cc
index 4135a6c98864a3dae82dff11f5812666df3d09f6..9964be5b7b94f2e0efae799dafb25bc3339c1789 100644 (file)
@@ -3,46 +3,48 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 /*
   UGH. too many includes.
  */
-#include "debug.hh"
+#include <stdio.h>
+
+#include "warn.hh"
 #include "music-iterator.hh"
 #include "translator-group.hh"
 #include "music-wrapper.hh"
 #include "music-wrapper-iterator.hh"
 #include "simple-music-iterator.hh"
-#include "context-specced-music.hh"
+
+#include "ly-smobs.icc"
 
 Music_iterator::Music_iterator ()
 {
+  music_ = 0;
+  smobify_self ();
 }
 
 Music_iterator::Music_iterator (Music_iterator const& src)
 {
   handle_ = *src.handle_.clone ();
-  music_l_ = src.music_l_;
+  music_ = src.music_;
   music_length_ = src.music_length_;
   start_mom_ = src.start_mom_;
+  smobify_self ();
 }
 
 Music_iterator::~Music_iterator ()
 {
 }
 
-
-
-
 Translator_group* 
-Music_iterator::report_to_l () const
+Music_iterator::report_to () const
 {
-  return handle_.report_to_l ();
+  return handle_.report_to ();
 }
 
-
 void
 Music_iterator::set_translator (Translator_group *trans)
 {
@@ -77,43 +79,46 @@ Music_iterator::skip (Moment)
 }
 
 SCM
-Music_iterator::get_music (Moment)const
+Music_iterator::get_pending_events (Moment)const
 {
   return SCM_EOL;
 }
 
-Music_iterator*
-Music_iterator::static_get_iterator_p (Music *m)
+SCM
+Music_iterator::get_static_get_iterator (Music *m)
 {
   Music_iterator * p =0;
 
   SCM ctor = m->get_mus_property ("iterator-ctor") ;
-  if (unsmob_cxx_function (ctor))
+  SCM iter = SCM_EOL;
+  if (gh_procedure_p (ctor))
     {
-      Cxx_function f =  unsmob_cxx_function (ctor);
-      
-      p = (Music_iterator*) (*f) (SCM_EOL);
+      iter = gh_call0 (ctor);
+      p = unsmob_iterator (iter);
     }
-  else if (dynamic_cast<Music_wrapper   *> (m))
-    p = new Music_wrapper_iterator;
   else
     {
-      p = new Simple_music_iterator ;
+      if (dynamic_cast<Music_wrapper *> (m))
+       p = new Music_wrapper_iterator;
+      else
+       p = new Simple_music_iterator;
+
+      iter = p->self_scm();
+      scm_gc_unprotect_object (iter);
     }
 
-  p->music_l_ = m;
+  p->music_ = m;
   assert (m);
-  p->music_length_ = m->length_mom ();
+  p->music_length_ = m->get_length ();
   p->start_mom_ = m->start_mom ();
-  return p;
+  return iter;
 }
 
 
 Moment
-Music_iterator::music_length_mom () const
+Music_iterator::music_get_length () const
 {
   return music_length_;
-
 }
 
 Moment
@@ -123,42 +128,25 @@ Music_iterator::music_start_mom ()const
 }
 
 void
-Music_iterator::init_translator (Music *m, Translator_group *report_l)
+Music_iterator::init_translator (Music *m, Translator_group *report)
 {
-  music_l_ = m;
+  music_ = m;
   assert (m);
-  if (Context_specced_music * csm =dynamic_cast<Context_specced_music *> (m))
-    {
-      SCM ct = csm->get_mus_property ("context-type");
-      String c_type;
-      if (gh_string_p (ct))
-         c_type =  ly_scm2string (ct);
-      
-      String c_id;
-      SCM ci = csm->get_mus_property ("context-id");
-      if (gh_string_p (ci))
-       c_id = ly_scm2string (ci);
-      
-      Translator_group* a
-       =report_l->find_create_translator_l (c_type, c_id);
-
-      set_translator (a);
-      
-    }
-
-  if (! report_to_l ())
-    set_translator (report_l);
+  if (! report_to ())
+    set_translator (report);
 }
 
 
-Music_iterator*
-Music_iterator::get_iterator_p (Music *m) const
+SCM
+Music_iterator::get_iterator (Music *m) const
 {
-  Music_iterator*p = static_get_iterator_p (m);
-  p->init_translator (m, report_to_l ());
+  SCM ip = get_static_get_iterator (m);
+  Music_iterator*p = unsmob_iterator (ip);
+  
+  p->init_translator (m, report_to ());
   
   p->construct_children ();
-  return p;
+  return ip;
 }
 
 /*
@@ -166,11 +154,10 @@ Music_iterator::get_iterator_p (Music *m) const
   Iterator::try_music
   
  */
-
 Music_iterator*
 Music_iterator::try_music (Music *m) const
 {
-  bool b = report_to_l ()->try_music ((Music*)m); // ugh
+  bool b = report_to ()->try_music ((Music*)m); // ugh
   Music_iterator * it = b ? (Music_iterator*) this : 0;        // ugh
   if (!it)
     it = try_music_in_children (m);
@@ -186,7 +173,60 @@ Music_iterator::try_music_in_children (Music *) const
 IMPLEMENT_CTOR_CALLBACK (Music_iterator);
 
 Music *
-Music_iterator::music_l () const
+Music_iterator::get_music () const
+{
+  return music_;
+}
+
+/****************************************************************/
+
+IMPLEMENT_TYPE_P (Music_iterator, "ly:iterator?");
+IMPLEMENT_SMOBS(Music_iterator);
+IMPLEMENT_DEFAULT_EQUAL_P(Music_iterator);
+
+SCM
+Music_iterator::mark_smob (SCM smob)
+{
+  Music_iterator * mus = (Music_iterator *)SCM_CELL_WORD_1 (smob);
+
+  mus->derived_mark ();
+  /*
+    Careful with GC, although we intend the following as pointers
+    only, we _must_ mark them.
+   */
+  if (mus->report_to())
+    scm_gc_mark (mus->report_to()->self_scm());
+  if (mus->music_)
+    scm_gc_mark (mus->music_->self_scm());
+  
+
+  return SCM_EOL;
+}
+
+int
+Music_iterator::print_smob (SCM sm , SCM port, scm_print_state*)
+{
+  char s[1000];
+
+  Music_iterator *iter = unsmob_iterator (sm);
+  sprintf (s, "#<%s>", classname (iter));
+  scm_puts (s, port);
+  return 1;
+}
+
+void
+Music_iterator::derived_mark()const
+{
+}
+
+void
+Music_iterator::quit ()
+{
+  do_quit ();
+  handle_.quit ();
+}
+
+void
+Music_iterator::do_quit()
 {
-  return music_l_;
 }