X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscheme-engraver.cc;h=ec4197641bfcba78386ee3b11c9becd6e24cf762;hb=2280391948b1e5879606cc8494f1fc1787386c8c;hp=8d2054161bf716b577c4f4a4c61442cbd584cd13;hpb=d2762a4f1add2bb04d6fc34d3c7ae03eeb7d500f;p=lilypond.git

diff --git a/lily/scheme-engraver.cc b/lily/scheme-engraver.cc
index 8d2054161b..ec4197641b 100644
--- a/lily/scheme-engraver.cc
+++ b/lily/scheme-engraver.cc
@@ -25,7 +25,7 @@
 
 #include "translator.icc"
 
-Scheme_engraver::Scheme_engraver ()
+Scheme_engraver::Scheme_engraver (SCM definition)
 {
   stop_translation_timestep_function_ = SCM_EOL;
   start_translation_timestep_function_ = SCM_EOL;
@@ -33,24 +33,18 @@ Scheme_engraver::Scheme_engraver ()
   process_acknowledged_function_ = SCM_EOL;
   initialize_function_ = SCM_EOL;
   finalize_function_ = SCM_EOL;
-  listeners_alist_ = SCM_EOL;
 
   interface_acknowledger_hash_ = SCM_EOL;
   interface_end_acknowledger_hash_ = SCM_EOL;
 
   must_be_last_ = false;
-  per_instance_listeners_ = 0;
+  per_instance_listeners_ = SCM_EOL;
+
+  init_from_scheme (definition);
 }
 
 Scheme_engraver::~Scheme_engraver ()
 {
-  translator_listener_record *next = 0;
-  for (translator_listener_record *r = per_instance_listeners_;
-       r; r = next)
-    {
-      next = r->next_;
-      delete r;
-    }
 }
 
 // Extracts the value if callable, if not return #f.
@@ -82,13 +76,12 @@ Scheme_engraver::init_from_scheme (SCM definition)
 
   SCM listeners = ly_assoc_get (ly_symbol2scm ("listeners"), definition, SCM_EOL);
 
-  listeners_alist_ = SCM_EOL;
+  per_instance_listeners_ = SCM_EOL;
 
   must_be_last_ = to_boolean (ly_assoc_get (ly_symbol2scm ("must-be-last"),
                                             definition,
                                             SCM_BOOL_F));
 
-  translator_listener_record **tail = &per_instance_listeners_;
   for (SCM p = listeners; scm_is_pair (p); p = scm_cdr (p))
     {
       SCM event_class = scm_caar (p);
@@ -100,13 +93,7 @@ Scheme_engraver::init_from_scheme (SCM definition)
       // We should check the arity of the function?
 
       // Record for later lookup.
-      listeners_alist_ = scm_acons (event_class, proc, listeners_alist_);
-
-      translator_listener_record *rec = new translator_listener_record;
-      *tail = rec;
-      rec->event_class_ = event_class;
-      rec->get_listener_ = &Scheme_engraver::get_listener;
-      tail = &rec->next_;
+      per_instance_listeners_ = scm_acons (event_class, proc, per_instance_listeners_);
     }
 
   init_acknowledgers (ly_assoc_get (ly_symbol2scm ("acknowledgers"),
@@ -171,49 +158,7 @@ Scheme_engraver::acknowledge_grob_by_hash (Grob_info info,
     }
 }
 
-static
-void call_listen_closure (void *target, SCM ev)
-{
-  SCM cl = (SCM) target;
-  SCM func = scm_car (cl);
-  SCM engraver = scm_cdr (cl);
-  scm_call_2 (func, engraver, ev);
-}
-
-static
-void mark_listen_closure (void *target)
-{
-  scm_gc_mark ((SCM)target);
-}
-
-static
-bool equal_listen_closure (void *a, void *b)
-{
-  SCM target_a = (SCM) a;
-  SCM target_b = (SCM) b;
-
-  return ly_is_equal (target_a, target_b);
-}
-
-Listener_function_table listen_closure
-=
-{
-  call_listen_closure, mark_listen_closure, equal_listen_closure
-};
-
-/* static */
-Listener
-Scheme_engraver::get_listener (void *arg, SCM name)
-{
-  Scheme_engraver *me = (Scheme_engraver *) arg;
-  SCM func = ly_assoc_get (name, me->listeners_alist_, SCM_BOOL_F);
-  assert (ly_is_procedure (func));
-
-  SCM closure = scm_cons (func, me->self_scm ());
-  return Listener ((void *)closure, &listen_closure);
-}
-
-translator_listener_record *
+SCM
 Scheme_engraver::get_listener_list () const
 {
   return per_instance_listeners_;
@@ -243,7 +188,7 @@ Scheme_engraver::derived_mark () const
   scm_gc_mark (finalize_function_);
   scm_gc_mark (process_music_function_);
   scm_gc_mark (process_acknowledged_function_);
-  scm_gc_mark (listeners_alist_);
+  scm_gc_mark (per_instance_listeners_);
   scm_gc_mark (interface_acknowledger_hash_);
   scm_gc_mark (interface_end_acknowledger_hash_);
 }
@@ -251,17 +196,4 @@ Scheme_engraver::derived_mark () const
 ADD_ACKNOWLEDGER (Scheme_engraver, grob);
 ADD_END_ACKNOWLEDGER (Scheme_engraver, grob);
 
-ADD_TRANSLATOR (Scheme_engraver,
-                /* doc */
-                "Implement engravers in Scheme.  Interprets arguments to"
-                " @code{\\consists} as callbacks.",
-
-                /* create */
-                "",
-
-                /* read */
-                "",
-
-                /* write */
-                ""
-               );
+ADD_TRANSLATOR_FAMILY (Scheme_engraver);