source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "translator-group.hh"
-#include "debug.hh"
+#include "warn.hh"
#include "simultaneous-music-iterator.hh"
#include "music-list.hh"
#include "killing-cons.tcc"
+
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)
: Music_iterator (src)
{
- separate_contexts_b_ = src.separate_contexts_b_;
- for (Cons<Music_iterator> *p = src.children_p_list_.head_; p; p = p->next_)
+ separate_contexts_b_
+ = src.separate_contexts_b_;
+
+ SCM children_list = SCM_EOL;
+ SCM *tail = &children_list;
+ for (SCM s = src.children_list_; gh_pair_p (s); s = gh_cdr(s))
{
- Music_iterator *i = p->car_;
- children_p_list_.append (new Killing_cons<Music_iterator> (i->clone (), 0));
+ Music_iterator *i = unsmob_iterator (gh_car (s));
+ SCM cl = i->clone ()->self_scm();
+ *tail = scm_cons (cl, *tail);
+ tail = SCM_CDRLOC (*tail);
+ scm_gc_unprotect_object (cl);
}
+
+ children_list_ = children_list;
+ scm_remember_upto_here_1 (children_list);
}
-Simultaneous_music_iterator::~Simultaneous_music_iterator ()
+void
+Simultaneous_music_iterator::derived_mark()const
{
- children_p_list_.junk ();
+ scm_gc_mark (children_list_);
}
SCM
-Simultaneous_music_iterator::get_music (Moment m)const
+Simultaneous_music_iterator::get_pending_events (Moment m)const
{
- SCM s = SCM_EOL;
- for (Cons<Music_iterator> *p = children_p_list_.head_; p; p = p->next_)
+ SCM l = SCM_EOL;
+ for (SCM s = children_list_; gh_pair_p (s); s = gh_cdr(s))
{
- s = gh_append2 (p->car_->get_music (m), s);
+ l = gh_append2 (unsmob_iterator (gh_car (s))->get_pending_events (m), l);
}
- return s;
+ return l;
}
void
-Simultaneous_music_iterator::construct_children()
+Simultaneous_music_iterator::construct_children ()
{
int j = 0;
- Music_sequence const *sim = dynamic_cast<Music_sequence const*> (music_l_);
- SCM i = sim->music_list ();
- for (; gh_pair_p(i); i = gh_cdr(i), j++)
+ SCM i = get_music ()->get_mus_property ("elements");
+
+ children_list_ = SCM_EOL;
+ SCM * tail = &children_list_;
+ for (; gh_pair_p (i); i = ly_cdr (i), j++)
{
- Music *mus = unsmob_music (gh_car (i));
- Music_iterator * mi = static_get_iterator_p (mus);
+ Music *mus = unsmob_music (ly_car (i));
+
+ SCM scm_iter = get_static_get_iterator (mus);
+ Music_iterator * mi = unsmob_iterator (scm_iter);
/* if separate_contexts_b_ is set, create a new context with the
number number as name */
Translator_group * t = (j && separate_contexts_b_)
- ? report_to_l ()->find_create_translator_l (report_to_l()->type_str_,
- to_str (j))
- : report_to_l ();
+ ? report_to ()->find_create_translator (report_to ()->type_string_,
+ to_string (j))
+ : report_to ();
if (!t)
- t = report_to_l ();
+ t = report_to ();
mi->init_translator (mus, t);
mi->construct_children ();
-
- if (mi->ok())
+
+ if (mi->ok ())
{
- children_p_list_.append (new Killing_cons<Music_iterator> (mi,0));
+ *tail = scm_cons (scm_iter, *tail);
+ tail = SCM_CDRLOC (*tail);
}
else
- delete mi;
+ mi->set_translator (0);
}
}
-
void
Simultaneous_music_iterator::process (Moment until)
{
- for (Cons<Music_iterator> **pp = &children_p_list_.head_; *pp;)
+ SCM *proc = &children_list_;
+ while(gh_pair_p (*proc))
{
- Music_iterator * i = (*pp)->car_;
- if (i->pending_moment() == until)
+ Music_iterator * i = unsmob_iterator (gh_car (*proc));
+ if (i->pending_moment () == until)
{
i->process (until);
}
- if (!i->ok())
- delete children_p_list_.remove_cons (pp);
+ if (!i->ok ())
+ {
+ i->quit ();
+ *proc = gh_cdr (*proc);
+ }
else
- pp = &(*pp)->next_;
+ {
+ proc = SCM_CDRLOC(*proc);
+ }
}
}
void
Simultaneous_music_iterator::skip (Moment until)
{
- for (Cons<Music_iterator> **pp = &children_p_list_.head_; *pp;)
+ SCM *proc = &children_list_;
+ while(gh_pair_p (*proc))
{
- Music_iterator * i = (*pp)->car_;
- if (i->pending_moment() <= until)
+ Music_iterator * i = unsmob_iterator (gh_car (*proc));
+ if (i->pending_moment () <= until)
{
i->skip (until);
}
- if (!i->ok())
- delete children_p_list_.remove_cons (pp);
+ if (!i->ok ())
+ {
+ i->quit ();
+ *proc = gh_cdr (*proc);
+ }
else
- pp = &(*pp)->next_;
+ {
+ proc = SCM_CDRLOC(*proc);
+ }
}
}
Moment
-Simultaneous_music_iterator::pending_moment() const
+Simultaneous_music_iterator::pending_moment () const
{
Moment next;
next.set_infinite (1);
- for (Cons<Music_iterator> *p = children_p_list_.head_; p; p = p->next_)
- next = next <? p->car_->pending_moment() ;
+ for (SCM s = children_list_; gh_pair_p (s); s = gh_cdr(s))
+ next = next <? unsmob_iterator (gh_car (s))->pending_moment () ;
return next;
}
bool
-Simultaneous_music_iterator::ok() const
+Simultaneous_music_iterator::ok () const
{
- return children_p_list_.head_;
+ return gh_pair_p (children_list_);
}
Music_iterator*
Simultaneous_music_iterator::try_music_in_children (Music *m) const
{
Music_iterator * b=0;
- for (Cons<Music_iterator> *p = children_p_list_.head_; !b && p; p = p->next_)
- b =p->car_->try_music (m);
+ for (SCM s = children_list_; !b && gh_pair_p (s); s = gh_cdr(s))
+ b =unsmob_iterator (gh_car (s))->try_music (m);
return b;
}
+void
+Simultaneous_music_iterator::do_quit ()
+{
+ for (SCM s = children_list_; gh_pair_p (s); s = gh_cdr(s))
+ unsmob_iterator (gh_car (s))->quit();
+}
-IMPLEMENT_CTOR_CALLBACK(Simultaneous_music_iterator);
+IMPLEMENT_CTOR_CALLBACK (Simultaneous_music_iterator);
projects / lilypond.git / blobdiff