Nitpick run.

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

diff --git a/lily/translator-group.cc b/lily/translator-group.cc
index 1ec1f8216335e2393ece2f7af15f127c1121a4c9..5bf64576eb0b647e6fabeb4239b8fad5ef000837 100644 (file)
--- a/lily/translator-group.cc
+++ b/lily/translator-group.cc
@@ -32,8 +32,12 @@ translator_each (SCM list, Translator_method method)
 void
 Translator_group::initialize ()
 {
-  SCM tab = scm_make_vector (scm_int2num (19), SCM_BOOL_F);
-  context ()->set_property ("acceptHashTable", tab);
+  precompute_method_bindings ();
+}
+
+void
+Translator_group::finalize ()
+{
 }
 
 bool
@@ -66,7 +70,6 @@ find_accept_translators (SCM gravlist, SCM ifaces)
 bool
 Translator_group::try_music (Music *m)
 {
-  SCM tab = get_property ("acceptHashTable");
   SCM name = scm_sloppy_assq (ly_symbol2scm ("name"),
                              m->get_property_alist (false));
 
@@ -74,12 +77,12 @@ Translator_group::try_music (Music *m)
     return false;
 
   name = scm_cdr (name);
-  SCM accept_list = scm_hashq_ref (tab, name, SCM_UNDEFINED);
+  SCM accept_list = scm_hashq_ref (accept_hash_table_, name, SCM_UNDEFINED);
   if (accept_list == SCM_BOOL_F)
     {
       accept_list = find_accept_translators (get_simple_trans_list (),
                                             m->get_property ("types"));
-      scm_hashq_set_x (tab, name, accept_list);
+      scm_hashq_set_x (accept_hash_table_, name, accept_list);
     }
 
   for (SCM p = accept_list; scm_is_pair (p); p = scm_cdr (p))
@@ -97,43 +100,139 @@ Translator_group::get_simple_trans_list ()
   return simple_trans_list_;
 }
 
-                           
 void
-recurse_over_translators (Context *c, Translator_method ptr, Direction dir)
+precomputed_recurse_over_translators (Context *c, Translator_precompute_index idx, Direction dir)
 {
   Translator_group *tg
     = dynamic_cast<Translator_group *> (c->implementation ());
-  
+
   if (dir == DOWN)
     {
-      translator_each (tg->get_simple_trans_list (),
-                      ptr);
-
-      (tg->*ptr) ();
+      tg->precomputed_translator_foreach (idx);
+      tg->call_precomputed_self_method (idx);
     }
 
   for (SCM s = c->children_contexts (); scm_is_pair (s);
        s = scm_cdr (s))
+    precomputed_recurse_over_translators (unsmob_context (scm_car (s)), idx, dir);
+
+  if (dir == UP)
     {
-      recurse_over_translators (unsmob_context (scm_car (s)), ptr, dir);
+      tg->precomputed_translator_foreach (idx);
+      tg->call_precomputed_self_method (idx);
     }
+}
+
+void
+recurse_over_translators (Context *c, Translator_method ptr, Translator_group_method tg_ptr, Direction dir)
+{
+  Translator_group *tg
+    = dynamic_cast<Translator_group *> (c->implementation ());
+
+  if (dir == DOWN)
+    {
+      (tg->*tg_ptr) ();
+      translator_each (tg->get_simple_trans_list (), ptr);
+    }
+
+  for (SCM s = c->children_contexts (); scm_is_pair (s);
+       s = scm_cdr (s))
+    recurse_over_translators (unsmob_context (scm_car (s)), ptr, tg_ptr, dir);
 
   if (dir == UP)
     {
       translator_each (tg->get_simple_trans_list (),
                       ptr);
 
-      (tg->*ptr) ();
+      (tg->*tg_ptr) ();
     }
 }
 
 Translator_group::Translator_group ()
 {
   simple_trans_list_ = SCM_EOL;
+  accept_hash_table_ = SCM_EOL;
+  context_ = 0;
+  smobify_self ();
+
+  accept_hash_table_ = scm_c_make_hash_table (19);
 }
 
 void
 Translator_group::derived_mark () const
 {
-  scm_gc_mark (simple_trans_list_);
 }
+
+void
+Translator_group::precompute_method_bindings ()
+{
+  for (SCM s = simple_trans_list_; scm_is_pair (s); s = scm_cdr (s))
+    {
+      Translator *tr = unsmob_translator (scm_car (s));
+      Translator_void_method_ptr ptrs[TRANSLATOR_METHOD_PRECOMPUTE_COUNT];
+      tr->fetch_precomputable_methods (ptrs);
+
+      assert (tr);
+      for (int i = 0; i < TRANSLATOR_METHOD_PRECOMPUTE_COUNT; i++)
+       {
+         if (ptrs[i])
+           precomputed_method_bindings_[i].push (Translator_method_binding (tr, ptrs[i]));
+       }
+    }
+
+  fetch_precomputable_methods (precomputed_self_method_bindings_);
+}
+
+void
+Translator_group::precomputed_translator_foreach (Translator_precompute_index idx)
+{
+  Array<Translator_method_binding> &bindings (precomputed_method_bindings_[idx]);
+  for (int i = 0; i < bindings.size (); i++)
+    bindings[i].invoke ();
+}
+
+void
+Translator_group::fetch_precomputable_methods (Translator_group_void_method ptrs[])
+{
+  for (int i = 0; i < TRANSLATOR_METHOD_PRECOMPUTE_COUNT; i++)
+    ptrs[i] = 0;
+}
+
+void
+Translator_group::call_precomputed_self_method (Translator_precompute_index idx)
+{
+  if (precomputed_self_method_bindings_[idx])
+    (*precomputed_self_method_bindings_[idx]) (this);
+}
+
+Translator_group::~Translator_group ()
+{
+}
+
+#include "ly-smobs.icc"
+
+IMPLEMENT_SMOBS (Translator_group);
+IMPLEMENT_DEFAULT_EQUAL_P (Translator_group);
+IMPLEMENT_TYPE_P (Translator_group, "ly:translator-group?");
+
+int
+Translator_group::print_smob (SCM s, SCM port, scm_print_state *)
+{
+  Translator_group *me = (Translator_group *) SCM_CELL_WORD_1 (s);
+  scm_puts ("#<Translator_group ", port);
+  scm_puts (classname (me), port);
+  scm_display (me->simple_trans_list_, port);
+  scm_puts (" >", port);
+  return 1;
+}
+
+SCM
+Translator_group::mark_smob (SCM smob)
+{
+  Translator_group *me = (Translator_group *)SCM_CELL_WORD_1 (smob);
+
+  me->derived_mark ();
+  scm_gc_mark (me->accept_hash_table_);
+  return me->simple_trans_list_;
+}
+