Merge branch 'master' of /home/jcharles/GIT/Lily/. into translation

[lilypond.git] / lily / include / translator.icc

diff --git a/lily/include/translator.icc b/lily/include/translator.icc
index 1d45061578ecc8338834c00eaf142ed36566c5d2..b649a1a197884aa7a86ce51d616eff51e3640675 100644 (file)
--- a/lily/include/translator.icc
+++ b/lily/include/translator.icc
@@ -49,8 +49,7 @@
   /* end define */
 
 #define DEFINE_TRANSLATOR_LISTENER_LIST(T) \
-  Protected_scm T::listener_list_ (SCM_EOL);    \
-  /* end define */
+  Protected_scm T::listener_list_ (SCM_EOL)
 
 #define DEFINE_ACKNOWLEDGERS(classname) \
   Drul_array<Protected_scm> classname::acknowledge_static_array_drul_;  \
@@ -73,8 +72,8 @@
   IMPLEMENT_FETCH_PRECOMPUTABLE_METHODS (classname);                    \
   DEFINE_ACKNOWLEDGERS(classname);                                      \
   ADD_THIS_TRANSLATOR (classname);                                      \
-  DEFINE_TRANSLATOR_DOC(classname, desc, grobs, read, write)            \
-  DEFINE_TRANSLATOR_LISTENER_LIST(classname)                            \
+  DEFINE_TRANSLATOR_DOC(classname, desc, grobs, read, write);           \
+  DEFINE_TRANSLATOR_LISTENER_LIST(classname);
 
 #define IMPLEMENT_FETCH_PRECOMPUTABLE_METHODS(T)                        \
   void                                                                  \
@@ -95,16 +94,17 @@
 
 void add_acknowledger (SCM ptr,
                        char const *func_name,
-                       Protected_scm &ack_hash);
+                       SCM &ack_hash);
 
 #define ADD_ACKNOWLEDGER(CLASS, NAME)                                   \
-  add_acknowledger (CLASS::ack_finder<&CLASS::acknowledge_ ## NAME> (), \
-                    #NAME, CLASS::acknowledge_static_array_drul_[START]);
+  add_acknowledger (Callback2_wrapper::make_smob                        \
+                    <ack_trampoline<CLASS, &CLASS::acknowledge_ ## NAME> > (), \
+                    #NAME, acknowledge_static_array_drul_[START])
 
 #define ADD_END_ACKNOWLEDGER(CLASS, NAME)                               \
-  add_acknowledger (CLASS::ack_finder<&CLASS::acknowledge_end_ ## NAME> (), \
-                    #NAME, CLASS::acknowledge_static_array_drul_[STOP]);
-
+  add_acknowledger (Callback2_wrapper::make_smob                        \
+                    <ack_trampoline<CLASS, &CLASS::acknowledge_end_ ## NAME> > (), \
+                    #NAME, acknowledge_static_array_drul_[STOP])
 
 /*
   Implement the method cl::listen_##m, and make it listen to stream
@@ -114,6 +114,6 @@ void add_acknowledger (SCM ptr,
   listener_list_ = scm_acons                                            \
     (event_class_symbol (#m),                                           \
      Callback_wrapper::make_smob                                        \
-     <trampoline <cl, &cl::listen_ ## m> > (), listener_list_);
+     <trampoline <cl, &cl::listen_ ## m> > (), listener_list_)
 
 #endif /* TRANSLATOR_ICC */