Restrict spread of symbols in church rests

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

diff --git a/lily/translator-group.cc b/lily/translator-group.cc
index 831a4790b08da67363a9106c7c4ff24ebe7aa4e1..a9f1690f62998712b5bfe0a7470c437f838025f1 100644 (file)
--- a/lily/translator-group.cc
+++ b/lily/translator-group.cc
@@ -36,10 +36,10 @@
 #include "warn.hh"
 
 void
-translator_each (SCM list, Translator_method method)
+translator_each (SCM list, SCM method)
 {
   for (SCM p = list; scm_is_pair (p); p = scm_cdr (p))
-    (unsmob<Translator> (scm_car (p))->*method) ();
+    scm_call_1 (method, scm_car (p));
 }
 
 void
@@ -170,7 +170,6 @@ Translator_group::create_child_translator (SCM sev)
         type = get_translator (definition);
       else if (ly_is_pair (definition))
         {
-          type = get_translator (ly_symbol2scm ("Scheme_engraver"));
           is_scheme = true;
         }
       else if (ly_is_procedure (definition))
@@ -179,17 +178,15 @@ Translator_group::create_child_translator (SCM sev)
           // an argument and evaluates to an a-list scheme engraver
           // definition.
           definition = scm_call_1 (definition, cs);
-          type = get_translator (ly_symbol2scm ("Scheme_engraver"));
           is_scheme = true;
         }
 
-      if (!type)
+      if (!is_scheme && !type)
         warning (_f ("cannot find: `%s'", ly_symbol2string (scm_car (s)).c_str ()));
       else
         {
-          Translator *instance = type->clone ();
-          if (is_scheme)
-            dynamic_cast<Scheme_engraver *> (instance)->init_from_scheme (definition);
+          Translator *instance = is_scheme ? new Scheme_engraver (definition)
+            : type->clone ();
 
           SCM str = instance->self_scm ();
 
@@ -222,10 +219,11 @@ Translator_group::create_child_translator (SCM sev)
   g->connect_to_context (new_context);
   g->unprotect ();
 
-  recurse_over_translators (new_context,
-                            &Translator::initialize,
-                            &Translator_group::initialize,
-                            DOWN);
+  recurse_over_translators
+    (new_context,
+     Callback0_wrapper::make_smob<Translator, &Translator::initialize> (),
+     Callback0_wrapper::make_smob<Translator_group, &Translator_group::initialize> (),
+     DOWN);
 }
 
 SCM
@@ -243,7 +241,6 @@ precomputed_recurse_over_translators (Context *c, Translator_precompute_index id
   if (tg && dir == DOWN)
     {
       tg->precomputed_translator_foreach (idx);
-      tg->call_precomputed_self_method (idx);
     }
 
   for (SCM s = c->children_contexts (); scm_is_pair (s);
@@ -253,20 +250,19 @@ precomputed_recurse_over_translators (Context *c, Translator_precompute_index id
   if (tg && dir == UP)
     {
       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)
+recurse_over_translators (Context *c, SCM ptr,
+                          SCM tg_ptr, Direction dir)
 {
-  Translator_group *tg
-    = dynamic_cast<Translator_group *> (c->implementation ());
+  Translator_group *tg = c->implementation ();
+  SCM tg_scm = tg ? tg->self_scm () : SCM_UNDEFINED;
 
   if (tg && dir == DOWN)
     {
-      (tg->*tg_ptr) ();
+      scm_call_1 (tg_ptr, tg_scm);
       translator_each (tg->get_simple_trans_list (), ptr);
     }
 
@@ -279,7 +275,7 @@ recurse_over_translators (Context *c, Translator_method ptr,
       translator_each (tg->get_simple_trans_list (),
                        ptr);
 
-      (tg->*tg_ptr) ();
+      scm_call_1 (tg_ptr, tg_scm);
     }
 }
 
@@ -302,40 +298,25 @@ 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::Callback ptrs[TRANSLATOR_METHOD_PRECOMPUTE_COUNT];
+      SCM 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_back (Translator_method_binding (tr, ptrs[i]));
+          if (!SCM_UNBNDP (ptrs[i]))
+            precomputed_method_bindings_[i].push_back (Method_instance (ptrs[i], tr));
         }
     }
 
-  fetch_precomputable_methods (precomputed_self_method_bindings_);
 }
 
 void
 Translator_group::precomputed_translator_foreach (Translator_precompute_index idx)
 {
-  vector<Translator_method_binding> &bindings (precomputed_method_bindings_[idx]);
+  vector<Method_instance> &bindings (precomputed_method_bindings_[idx]);
   for (vsize 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);
+    bindings[i]();
 }
 
 Translator_group::~Translator_group ()
@@ -343,7 +324,7 @@ Translator_group::~Translator_group ()
 }
 
 
-const char Translator_group::type_p_name_[] = "ly:translator-group?";
+const char * const Translator_group::type_p_name_ = "ly:translator-group?";
 
 int
 Translator_group::print_smob (SCM port, scm_print_state *) const