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 7fc128fe72f68d732fa448f9a42d4755fc17e7c3..b649a1a197884aa7a86ce51d616eff51e3640675 100644 (file)
--- a/lily/include/translator.icc
+++ b/lily/include/translator.icc
@@ -20,9 +20,9 @@
 #ifndef TRANSLATOR_ICC
 #define TRANSLATOR_ICC
 
-#include "listener.hh"
+#include "callback.hh"
 #include "std-vector.hh"
-#include "translator.hh"
+#include "engraver.hh"
 
 /*
   TODO: derive "foo-bar-interface" from Foo_bar classname.
@@ -35,6 +35,7 @@
   SCM T::static_description_ = SCM_EOL;                                 \
   static void _ ## T ## _adder ()                                       \
   {                                                                     \
+    T::boot ();                                                         \
     T *t = new T;                                                       \
     T::static_description_ =                                            \
       scm_permanent_object (t->static_translator_description ());       \
@@ -44,24 +45,19 @@
   {                                                                     \
     return static_description_;                                         \
   }                                                                     \
-  ADD_GLOBAL_CTOR (_ ## T ## _adder); \
+  ADD_GLOBAL_CTOR (_ ## T ## _adder);                                   \
   /* 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< vector<Acknowledge_information> > classname::acknowledge_static_array_drul_;      \
-  Translator::Grob_info_callback                                        \
-  classname::static_get_acknowledger (SCM sym)                          \
-  {                                                                     \
-    return generic_get_acknowledger (sym, &acknowledge_static_array_drul_[START]);      \
-  }                                                                     \
-  Translator::Grob_info_callback                                        \
-  classname::static_get_end_acknowledger (SCM sym)                      \
+  Drul_array<Protected_scm> classname::acknowledge_static_array_drul_;  \
+  SCM                                                                   \
+  classname::static_get_acknowledger (SCM sym, Direction start_end)     \
   {                                                                     \
-    return generic_get_acknowledger (sym, &acknowledge_static_array_drul_[STOP]);       \
+    return generic_get_acknowledger                                     \
+      (sym, acknowledge_static_array_drul_[start_end]);                 \
   }                                                                     \
   /* end define */
 
@@ -74,73 +70,50 @@
 
 #define ADD_TRANSLATOR(classname, desc, grobs, read, write)             \
   IMPLEMENT_FETCH_PRECOMPUTABLE_METHODS (classname);                    \
+  DEFINE_ACKNOWLEDGERS(classname);                                      \
   ADD_THIS_TRANSLATOR (classname);                                      \
-  DEFINE_TRANSLATOR_DOC(classname, desc, grobs, read, write)            \
-  DEFINE_ACKNOWLEDGERS(classname) \
-  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                                                                  \
-  T::fetch_precomputable_methods (Translator::Callback ptrs[])         \
+  T::fetch_precomputable_methods (SCM ptrs[])                           \
   {                                                                     \
     ptrs[START_TRANSLATION_TIMESTEP] =                                  \
-      (&T::start_translation_timestep                                  \
-       == &Translator::start_translation_timestep)                     \
-      ? 0                                                              \
-      : static_cast<Callback> (&T::start_translation_timestep);                \
+      method_finder <&T::start_translation_timestep> ();                \
                                                                        \
     ptrs[STOP_TRANSLATION_TIMESTEP] =                                  \
-      (& T::stop_translation_timestep == & Translator::stop_translation_timestep) \
-      ? 0                                                              \
-      : static_cast<Callback> (&T::stop_translation_timestep);         \
-                                                                       \
+      method_finder <&T::stop_translation_timestep> ();                 \
+                                                                        \
     ptrs[PROCESS_MUSIC] =                                              \
-      (&T::process_music == &Translator::process_music)                        \
-      ? 0                                                              \
-      : static_cast<Callback> (&T::process_music);                     \
+      method_finder <&T::process_music> ();                             \
                                                                        \
     ptrs[PROCESS_ACKNOWLEDGED] =                                       \
-      (&T::process_acknowledged == &Translator::process_acknowledged)  \
-      ? 0                                                              \
-      : static_cast<Callback> (&T::process_acknowledged);              \
+      method_finder <&T::process_acknowledged> ();                      \
   }
 
-void add_acknowledger (Translator::Grob_info_callback ptr,
+void add_acknowledger (SCM ptr,
                        char const *func_name,
-                       vector<Acknowledge_information> *ack_array);
-
-Translator::Grob_info_callback
-generic_get_acknowledger (SCM sym,
-                          vector<Acknowledge_information> const *ack_array);
+                       SCM &ack_hash);
 
 #define ADD_ACKNOWLEDGER(CLASS, NAME)                                   \
-  void CLASS ## NAME ## _ack_adder ()                                   \
-  {                                                                     \
-    add_acknowledger (static_cast<Translator::Grob_info_callback> (&CLASS::acknowledge_ ## NAME), #NAME, &CLASS::acknowledge_static_array_drul_[START]); \
-  }                                                                     \
-  ADD_SCM_INIT_FUNC (CLASS ## NAME ## _ack_adder_initclass, CLASS ## NAME ## _ack_adder);
+  add_acknowledger (Callback2_wrapper::make_smob                        \
+                    <ack_trampoline<CLASS, &CLASS::acknowledge_ ## NAME> > (), \
+                    #NAME, acknowledge_static_array_drul_[START])
 
-#define ADD_END_ACKNOWLEDGER(CLASS, NAME)                                       \
-  void CLASS ## NAME ## _end_ack_adder ()                                       \
-  {                                                                     \
-    add_acknowledger (static_cast<Translator::Grob_info_callback> (&CLASS::acknowledge_end_ ## NAME), #NAME, &CLASS::acknowledge_static_array_drul_[STOP]); \
-  }                                                                     \
-  ADD_SCM_INIT_FUNC (CLASS ## NAME ## _end_ack_adder_initclass, CLASS ## NAME ## _end_ack_adder);
+#define ADD_END_ACKNOWLEDGER(CLASS, NAME)                               \
+  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
   events of class m.
  */
-#define IMPLEMENT_TRANSLATOR_LISTENER(cl, m)            \
-void                                                    \
-cl :: _internal_declare_ ## m ()                        \
-{                                                       \
+#define ADD_LISTENER(cl, m)                                             \
   listener_list_ = scm_acons                                            \
     (event_class_symbol (#m),                                           \
-     Callback_wrapper::make_smob<cl, Stream_event *, &cl::listen_ ## m> (), \
-     listener_list_);                                                   \
-}                                                                       \
-                                                                        \
-ADD_SCM_INIT_FUNC (cl ## _declare_event_ ## m, cl::_internal_declare_ ## m);
+     Callback_wrapper::make_smob                                        \
+     <trampoline <cl, &cl::listen_ ## m> > (), listener_list_)
 
 #endif /* TRANSLATOR_ICC */