release: 1.1.43

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

diff --git a/lily/translator-group.cc b/lily/translator-group.cc
index fcb11f859bd849ad7b580d7838b6b0746075f6da..8c244b705b888fa2df4bbf7fce73bce206917aeb 100644 (file)
--- a/lily/translator-group.cc
+++ b/lily/translator-group.cc
@@ -19,6 +19,7 @@ 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_;
@@ -74,6 +75,19 @@ Translator_group::set_acceptor (String accepts, bool add)
        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)
 {
@@ -81,19 +95,29 @@ 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 (Cons<Translator> *p = trans_p_list_.head_cons_p_; p; p = p->next_cons_p_)
+  for (Cons<Translator> *p = trans_p_list_.head_; p; p = p->next_)
     {
-      if (dynamic_cast <Translator_group *> (p->car_p_))
+      if (dynamic_cast <Translator_group *> (p->car_))
        return false;
     }
 
@@ -224,10 +248,10 @@ Link_array<Translator_group>
 Translator_group::group_l_arr () const
 {
   Link_array<Translator_group> groups;
-  for (Cons<Translator> *p = trans_p_list_.head_cons_p_; p; p = p->next_cons_p_)
+  for (Cons<Translator> *p = trans_p_list_.head_; p; p = p->next_)
     {
-      if (dynamic_cast <Translator_group *> (p->car_p_))
-       groups.push (dynamic_cast <Translator_group *> (p->car_p_));
+      if (dynamic_cast <Translator_group *> (p->car_))
+       groups.push (dynamic_cast <Translator_group *> (p->car_));
     }
   return groups;
 }
@@ -236,10 +260,10 @@ Link_array<Translator>
 Translator_group::nongroup_l_arr () const
 {
   Link_array<Translator> groups;
-  for (Cons<Translator> *p = trans_p_list_.head_cons_p_; p; p = p->next_cons_p_)
+  for (Cons<Translator> *p = trans_p_list_.head_; p; p = p->next_)
     {
-      if (!dynamic_cast <Translator_group *> (p->car_p_))
-       groups.push (p->car_p_);
+      if (!dynamic_cast <Translator_group *> (p->car_))
+       groups.push (p->car_);
     }
   return groups;
 }
@@ -266,11 +290,11 @@ Translator_group::remove_translator_p (Translator*trans_l)
 {
   assert (trans_l);
   
-  for (Cons<Translator> **pp = &trans_p_list_.head_cons_p_; *pp; pp = &(*pp)->next_cons_p_)
-    if ((*pp)->car_p_ == trans_l)
+  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_p (pp);
-       r->car_p_ =0;
+       Cons<Translator> *r = trans_p_list_.remove_cons (pp);
+       r->car_ =0;
        trans_l->daddy_trans_l_ =0;
        delete r;
        return trans_l;
@@ -328,16 +352,16 @@ Translator_group::get_default_interpreter()
 void
 Translator_group::each (Method_pointer method)
 {
-  for (Cons<Translator> *p = trans_p_list_.head_cons_p_; p; p = p->next_cons_p_)
-    (p->car_p_->*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 (Cons<Translator> *p = trans_p_list_.head_cons_p_; p; p = p->next_cons_p_)
-    (p->car_p_->*method) ();
+  for (Cons<Translator> *p = trans_p_list_.head_; p; p = p->next_)
+    (p->car_->*method) ();
 }
 
 void
@@ -404,12 +428,22 @@ Translator_group::do_add_processing ()
 {
    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
@@ -422,10 +456,12 @@ Translator_group::get_property (String id,
        *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 "";