release: 1.1.0

[lilypond.git] / lily / translator-group.cc

diff --git a/lily/translator-group.cc b/lily/translator-group.cc
index 5846c2bb37dac7c543e3449103ee9a551ae0ad24..5d9a3e31fbbae6d1cc3b4c668b0179c0f5b16450 100644 (file)
--- a/lily/translator-group.cc
+++ b/lily/translator-group.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "music-output-def.hh"
@@ -35,13 +35,13 @@ Translator_group::Translator_group()
 void
 Translator_group::check_removal()
 {
-  for (int i =0; i < group_l_arr ().size();)
+  Link_array<Translator_group> groups (group_l_arr ());
+  
+  for (int i =0; i < groups.size(); i++)
     {
-      group_l_arr ()[i]->check_removal();
-      if (group_l_arr ()[i]->removable_b())
-       terminate_translator (group_l_arr ()[i]);
-      else
-       i++;
+      groups[i]->check_removal();
+      if (groups[i]->removable_b())
+       terminate_translator (groups[i]);
     }
 }
 
@@ -50,7 +50,7 @@ Translator_group::check_removal()
 IMPLEMENT_IS_TYPE_B1(Translator_group, Translator);
 
 void
-Translator_group::add (Translator *trans_p)
+Translator_group::add_translator (Translator *trans_p)
 {
   trans_p_list_.bottom().add (trans_p);
   trans_p->daddy_trans_l_ = this;
@@ -58,10 +58,41 @@ Translator_group::add (Translator *trans_p)
   trans_p->add_processing ();
 }
 
+void
+Translator_group::set_acceptor (String accepts, bool add)
+{
+  if (add)
+    accepts_str_arr_.push (accepts);
+  else
+    for (int i=accepts_str_arr_.size (); i--; )
+      if (accepts_str_arr_[i] == accepts)
+       accepts_str_arr_.del (i);
+}
+
+void
+Translator_group::set_element (String s, bool add)
+{
+  if (!get_translator_l (s))
+    error ("Program has no such type");
+
+  if (add)
+    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);
+}
+
 bool
 Translator_group::removable_b() const
 {
-  return !(iterator_count_ || group_l_arr ().size());
+  for (PCursor<Translator*> i (trans_p_list_.top ()); i.ok (); i++)
+    {
+      if (dynamic_cast <Translator_group *> (i.ptr ()))
+       return false;
+    }
+
+  return !iterator_count_;
 }
 
 Translator_group *
@@ -69,10 +100,12 @@ Translator_group::find_existing_translator_l (String n, String id)
 {
   if (is_alias_b (n) && (id_str_ == id || id.empty_b ()))
     return this;
+
+  Link_array<Translator_group> groups (group_l_arr ());
   Translator_group* r = 0;
-  for (int i =0; !r && i < group_l_arr ().size(); i++)
+  for (int i =0; !r && i < groups.size(); i++)
     {
-      r = group_l_arr ()[i]->find_existing_translator_l (n,id);
+      r = groups[i]->find_existing_translator_l (n,id);
     }
 
   return r;
@@ -85,9 +118,9 @@ Translator_group::path_to_acceptable_translator (String type) const
   for (int i=0; i < accepts_str_arr_.size (); i++)
     {
       Translator *t = output_def_l ()->find_translator_l (accepts_str_arr_[i]);
-      if (!t || !t->group_l ())
+      if (!t || !dynamic_cast <Translator_group *> (t))
        continue;
-      accepted_arr.push (t->group_l());
+      accepted_arr.push (dynamic_cast <Translator_group *> (t));
     }
 
 
@@ -133,8 +166,8 @@ Translator_group::find_create_translator_l (String n, String id)
       // start at 1.  The first one (index 0) will be us.
       for (int i=0; i < path.size (); i++)
        {
-         Translator_group * new_group = path[i]->clone ()->group_l ();
-         current->add (new_group);
+         Translator_group * new_group = dynamic_cast<Translator_group*>(path[i]->clone ());
+         current->add_translator (new_group);
          current = new_group;
        }
       current->id_str_ = id;
@@ -146,7 +179,7 @@ Translator_group::find_create_translator_l (String n, String id)
     ret = daddy_trans_l_->find_create_translator_l (n,id);
   else
     {
-      warning (_("Can't find or create `") + n + _("' called `") + id + "'\n");
+      warning (_f ("can't find or create `%s\' called `%s\'", n, id));
       ret =0;
     }
   return ret;
@@ -157,8 +190,11 @@ bool
 Translator_group::do_try_request (Request* req_l)
 {
   bool hebbes_b =false;
-  for (int i =0; !hebbes_b && i < nongroup_l_arr ().size() ; i++)
-    hebbes_b =nongroup_l_arr ()[i]->try_request (req_l);
+
+  Link_array<Translator> nongroups (nongroup_l_arr ());
+  
+  for (int i =0; !hebbes_b && i < nongroups.size() ; i++)
+    hebbes_b =nongroups[i]->try_request (req_l);
   if (!hebbes_b && daddy_trans_l_)
     hebbes_b = daddy_trans_l_->try_request (req_l);
   return hebbes_b ;
@@ -185,8 +221,8 @@ Translator_group::group_l_arr () const
   Link_array<Translator_group> groups;
   for (PCursor<Translator*> i (trans_p_list_.top ()); i.ok (); i++)
     {
-      if (i->group_l ())
-       groups.push (i->group_l ());
+      if (dynamic_cast <Translator_group *> (i.ptr ()))
+       groups.push (dynamic_cast <Translator_group *> (i.ptr ()));
     }
   return groups;
 }
@@ -197,7 +233,7 @@ Translator_group::nongroup_l_arr () const
   Link_array<Translator> groups;
   for (PCursor<Translator*> i (trans_p_list_.top ()); i.ok (); i++)
     {
-      if (!i->group_l ())
+      if (!dynamic_cast <Translator_group *> (i.ptr ()))
        groups.push (i.ptr ());
     }
   return groups;
@@ -206,7 +242,7 @@ Translator_group::nongroup_l_arr () const
 void
 Translator_group::terminate_translator (Translator*r_l)
 {
-  DOUT << "Removing " << r_l->name() << " at " << now_moment () << "\n";
+  DOUT << "Removing " << r_l->name() << " at " << now_moment () << '\n';
   r_l->removal_processing();
   Translator * trans_p =remove_translator_p (r_l);
 
@@ -233,10 +269,11 @@ Translator_group::remove_translator_p (Translator*trans_l)
 Translator*
 Translator_group::get_simple_translator (char const *type) const
 {
-  for (int i=0; i < nongroup_l_arr ().size(); i++)
+  Link_array<Translator> nongroups (nongroup_l_arr ());
+  for (int i=0; i < nongroups.size(); i++)
     {
-      if (nongroup_l_arr ()[i]->name() == type)
-       return nongroup_l_arr ()[i];
+      if (nongroups[i]->name() == type)
+       return nongroups[i];
     }
   if (daddy_trans_l_)
     return daddy_trans_l_->get_simple_translator (type);
@@ -258,8 +295,13 @@ Translator_group::get_default_interpreter()
   if (accepts_str_arr_.size())
     {
       Translator*t = output_def_l ()->find_translator_l (accepts_str_arr_[0]);
-      Translator_group * g= t->clone ()->group_l ();
-      add (g);
+      if (!t)
+       {
+         warning (_f ("can't find or create `%s\'", accepts_str_arr_[0]));
+         t = this;
+       }
+      Translator_group * g= dynamic_cast <Translator_group*>(t->clone ());
+      add_translator (g);
 
       if (!g->is_bottom_translator_b ())
        return g->get_default_interpreter ();
@@ -302,7 +344,7 @@ Translator_group::do_print() const
     {
       if (id_str_.length_i ())
        DOUT << "ID: " << id_str_ ;
-      DOUT << " iterators: " << iterator_count_<< "\n";
+      DOUT << " iterators: " << iterator_count_<< '\n';
     }
   each (&Translator::print);
 #endif
@@ -345,8 +387,8 @@ Translator_group::do_add_processing ()
     {
       Translator * t = output_def_l ()->find_translator_l (consists_str_arr_[i]);
       if (!t)
-       warning (_("Could not find `") +consists_str_arr_[i]+ "'");
+       warning (_f ("can't find `%s\'", consists_str_arr_[i]));
       else
-       add (t->clone ());
+       add_translator (t->clone ());
     }
 }