source file of the GNU LilyPond music typesetter
- (c) 1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "music-output-def.hh"
#include "translator-group.hh"
#include "translator.hh"
#include "debug.hh"
-#include "pcursor.hh"
#include "rational.hh"
#include "dictionary-iter.hh"
+#include "killing-cons.tcc"
+
Translator_group::Translator_group (Translator_group const&s)
: Translator(s)
{
consists_str_arr_ = s.consists_str_arr_;
+ consists_end_str_arr_ = s.consists_end_str_arr_;
accepts_str_arr_ = s.accepts_str_arr_;
iterator_count_ =0;
properties_dict_ = s.properties_dict_;
-
}
Translator_group::~Translator_group ()
{
assert (removable_b());
+ trans_p_list_.junk ();
}
void
Translator_group::add_translator (Translator *trans_p)
{
- trans_p_list_.bottom().add (trans_p);
+ trans_p_list_.append (new Killing_cons<Translator> (trans_p,0));
+
trans_p->daddy_trans_l_ = this;
trans_p->output_def_l_ = output_def_l_;
trans_p->add_processing ();
accepts_str_arr_.del (i);
}
+void
+Translator_group::add_last_element (String s)
+{
+ if (!get_translator_l (s))
+ error ("Program has no such type");
+
+ for (int i=consists_end_str_arr_.size (); i--; )
+ if (consists_end_str_arr_[i] == s)
+ warning (_f("Already contains a `%s\'", s));
+
+ consists_end_str_arr_.push (s);
+}
+
void
Translator_group::set_element (String s, bool add)
{
error ("Program has no such type");
if (add)
- consists_str_arr_.push (s);
+ {
+ for (int i=consists_str_arr_.size (); i--; )
+ if (consists_str_arr_[i] == s)
+ warning (_f("Already contains a `%s\'", s));
+
+ consists_str_arr_.push (s);
+ }
else
- for (int i=consists_str_arr_.size (); i--; )
- if (consists_str_arr_[i] == s)
- consists_str_arr_.del (i);
+ {
+ for (int i=consists_str_arr_.size (); i--; )
+ if (consists_str_arr_[i] == s)
+ consists_str_arr_.del (i);
+ for (int i=consists_end_str_arr_.size (); i--; )
+ if (consists_end_str_arr_[i] == s)
+ consists_end_str_arr_.del (i);
+ }
}
-
bool
Translator_group::removable_b() const
{
- for (PCursor<Translator*> i (trans_p_list_.top ()); i.ok (); i++)
+ for (Cons<Translator> *p = trans_p_list_.head_; p; p = p->next_)
{
- if (dynamic_cast <Translator_group *> (i.ptr ()))
+ if (dynamic_cast <Translator_group *> (p->car_))
return false;
}
Translator_group::group_l_arr () const
{
Link_array<Translator_group> groups;
- for (PCursor<Translator*> i (trans_p_list_.top ()); i.ok (); i++)
+ for (Cons<Translator> *p = trans_p_list_.head_; p; p = p->next_)
{
- if (dynamic_cast <Translator_group *> (i.ptr ()))
- groups.push (dynamic_cast <Translator_group *> (i.ptr ()));
+ if (dynamic_cast <Translator_group *> (p->car_))
+ groups.push (dynamic_cast <Translator_group *> (p->car_));
}
return groups;
}
Translator_group::nongroup_l_arr () const
{
Link_array<Translator> groups;
- for (PCursor<Translator*> i (trans_p_list_.top ()); i.ok (); i++)
+ for (Cons<Translator> *p = trans_p_list_.head_; p; p = p->next_)
{
- if (!dynamic_cast <Translator_group *> (i.ptr ()))
- groups.push (i.ptr ());
+ if (!dynamic_cast <Translator_group *> (p->car_))
+ groups.push (p->car_);
}
return groups;
}
+/**
+ End translator: call "destructor", remove from hierarchy, and delete
+ */
void
Translator_group::terminate_translator (Translator*r_l)
{
- DOUT << "Removing " << classname (r_l) << " at " << now_moment () << '\n';
+ DOUT << "Removing " << classname (r_l) << " at " << now_mom () << '\n';
r_l->removal_processing();
Translator * trans_p =remove_translator_p (r_l);
delete trans_p;
}
+
+/**
+ Remove a translator from the hierarchy.
+ */
Translator *
Translator_group::remove_translator_p (Translator*trans_l)
{
assert (trans_l);
- PCursor<Translator*> trans_cur (trans_p_list_.find (trans_l));
- Translator * t = trans_cur.remove_p();
- /*
- For elegant design, we would do this too. Alas, it does not work yet..
+ for (Cons<Translator> **pp = &trans_p_list_.head_; *pp; pp = &(*pp)->next_)
+ if ((*pp)->car_ == trans_l)
+ {
+ Cons<Translator> *r = trans_p_list_.remove_cons (pp);
+ r->car_ =0;
+ trans_l->daddy_trans_l_ =0;
+ delete r;
+ return trans_l;
+ }
- t-> removal_processing ();
- */
- t-> daddy_trans_l_ = 0;
- return t;
+ return 0;
}
void
Translator_group::each (Method_pointer method)
{
- for (PCursor<Translator*> i (trans_p_list_.top ()); i.ok (); i++)
- (i.ptr()->*method) ();
+ for (Cons<Translator> *p = trans_p_list_.head_; p; p = p->next_)
+ (p->car_->*method) ();
}
+
void
Translator_group::each (Const_method_pointer method) const
{
- for (PCursor<Translator*> i (trans_p_list_.top ()); i.ok (); i++)
- (i.ptr()->*method) ();
+ for (Cons<Translator> *p = trans_p_list_.head_; p; p = p->next_)
+ (p->car_->*method) ();
}
void
{
for (int i=0; i < consists_str_arr_.size(); i++)
{
- Translator * t = output_def_l ()->find_translator_l (consists_str_arr_[i]);
+ String s = consists_str_arr_[i];
+ Translator * t = output_def_l ()->find_translator_l (s);
if (!t)
- warning (_f ("can't find `%s\'", consists_str_arr_[i]));
+ warning (_f ("can't find `%s\'", s));
else
add_translator (t->clone ());
}
+ for (int i=0; i-- < consists_end_str_arr_.size (); i++)
+ {
+ String s = consists_end_str_arr_[i];
+ Translator * t = output_def_l ()->find_translator_l (s);
+ if (!t)
+ warning (_f ("can't find `%s\'", s));
+ else
+ add_translator (t->clone ());
+ }
}
Scalar
-Translator_group::get_property (String id, Translator_group **where_l) const
+Translator_group::get_property (String id,
+ Translator_group **where_l) const
{
if (properties_dict_.elem_b (id))
{
if (where_l)
- *where_l = this;
+ *where_l = (Translator_group*) this; // ugh
return properties_dict_[id];
}
-
+
+#if 1
if (daddy_trans_l_)
return daddy_trans_l_->get_property (id, where_l);
-
+#endif
+
if (where_l)
*where_l = 0;
return "";
projects / lilypond.git / blobdiff