X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Ftranslator.hh;h=ffd134efab66b96eb92f79a14e65546f6776ec0b;hb=6d1c5d25389afa6dbbfb4722df3732e764cbbf2e;hp=8154409efced3e763e13a6bd5862a371d8f7ae81;hpb=207f71b8b2ab9ca550e841615bedce393e652ca6;p=lilypond.git diff --git a/lily/include/translator.hh b/lily/include/translator.hh index 8154409efc..ffd134efab 100644 --- a/lily/include/translator.hh +++ b/lily/include/translator.hh @@ -23,30 +23,39 @@ #include "global-ctor.hh" #include "lily-proto.hh" #include "virtual-methods.hh" +#include "callback.hh" #include "input.hh" // for error reporting #include "smobs.hh" +#include "stream-event.hh" #include "std-vector.hh" #include "protected-scm.hh" -#define TRANSLATOR_DECLARATIONS_NO_LISTENER(NAME) \ +#define TRANSLATOR_FAMILY_DECLARATIONS(NAME) \ public: \ - NAME (); \ VIRTUAL_COPY_CONSTRUCTOR (Translator, NAME); \ - static SCM static_description_; \ - static Drul_array > acknowledge_static_array_drul_; \ - virtual void fetch_precomputable_methods (Callback methods[]); \ - virtual SCM static_translator_description () const; \ - virtual SCM translator_description () const; \ - static Grob_info_callback static_get_acknowledger (SCM sym); \ - static Grob_info_callback static_get_end_acknowledger(SCM); \ - virtual Grob_info_callback get_acknowledger (SCM sym) \ + virtual void fetch_precomputable_methods (SCM methods[]); \ + DECLARE_TRANSLATOR_CALLBACKS (NAME); \ + TRANSLATOR_INHERIT (Translator); \ + /* end #define */ + +#define TRANSLATOR_INHERIT(BASE) \ + using BASE::method_finder + +#define DECLARE_TRANSLATOR_CALLBACKS(NAME) \ + template \ + static SCM method_finder () \ { \ - return static_get_acknowledger (sym); \ + return Callback0_wrapper::make_smob (); \ } \ - virtual Grob_info_callback get_end_acknowledger (SCM sym) \ + template \ + static SCM method_finder () \ { \ - return static_get_end_acknowledger (sym); \ - } \ + return Callback_wrapper::make_smob > (); \ + } \ + template \ + static SCM method_finder () { \ + return Callback2_wrapper::make_smob > (); \ + } \ /* end #define */ /* @@ -57,25 +66,27 @@ */ #define TRANSLATOR_DECLARATIONS(NAME) \ - TRANSLATOR_DECLARATIONS_NO_LISTENER(NAME) \ -private: \ + public: \ + TRANSLATOR_FAMILY_DECLARATIONS (NAME); \ + static Drul_array acknowledge_static_array_drul_; \ + static SCM static_description_; \ static Protected_scm listener_list_; \ + static SCM static_get_acknowledger (SCM sym, Direction start_end); \ + virtual SCM get_acknowledger (SCM sym, Direction start_end) \ + { \ + return static_get_acknowledger (sym, start_end); \ + } \ public: \ + NAME (Context *); \ + static void boot (); \ + virtual SCM static_translator_description () const; \ + virtual SCM translator_description () const; \ virtual SCM get_listener_list () const \ { \ return listener_list_; \ } \ /* end #define */ -#define DECLARE_TRANSLATOR_LISTENER(m) \ -public: \ -inline void listen_ ## m (Stream_event *); \ -/* Should be private */ \ -static void _internal_declare_ ## m (); - -#define DECLARE_ACKNOWLEDGER(x) public : void acknowledge_ ## x (Grob_info); protected: -#define DECLARE_END_ACKNOWLEDGER(x) public : void acknowledge_end_ ## x (Grob_info); protected: - enum Translator_precompute_index { START_TRANSLATION_TIMESTEP, @@ -91,21 +102,14 @@ enum Translator_precompute_index class Translator : public Smob { public: - // We don't make Grob_info_callback specific to Engraver since we - // otherwise get into a circular mess with regard to the definitions - // as the timing of Engraver is exercised from within Translator - typedef void (Translator::*Grob_info_callback) (Grob_info); - typedef void (Translator::*Callback) (void); int print_smob (SCM, scm_print_state *) const; SCM mark_smob () const; - static const char type_p_name_[]; + static const char * const type_p_name_; virtual ~Translator (); -private: - void init (); -public: Context *context () const { return daddy_context_; } + Translator (Context *); Translator (Translator const &); SCM internal_get_property (SCM symbol) const; @@ -129,12 +133,35 @@ public: Context *get_score_context () const; Global_context *get_global_context () const; - TRANSLATOR_DECLARATIONS (Translator); + DECLARE_CLASSNAME (Translator); + virtual Translator *clone () const = 0; + virtual void fetch_precomputable_methods (SCM methods[]) = 0; + virtual SCM get_listener_list () const = 0; + virtual SCM translator_description () const = 0; + virtual SCM get_acknowledger (SCM sym, Direction start_end) = 0; protected: // should be private. Context *daddy_context_; void protect_event (SCM ev); - friend class Callback_wrapper; + + template + static SCM trampoline (SCM target, SCM event) + { + T *t = unsmob (target); + LY_ASSERT_SMOB (T, target, 1); + LY_ASSERT_SMOB (Stream_event, event, 2); + + t->protect_event (event); + (t->*callback) (unsmob (event)); + return SCM_UNSPECIFIED; + } + + // Fallback for non-overriden callbacks for which &T::x degrades to + // &Translator::x + template + static SCM + method_finder () { return SCM_UNDEFINED; } + virtual void derived_mark () const; static SCM event_class_symbol (const char *ev_class); SCM static_translator_description (const char *grobs, @@ -146,22 +173,13 @@ protected: // should be private. friend class Translator_group; }; -struct Acknowledge_information -{ - SCM symbol_; - Translator::Grob_info_callback function_; - - Acknowledge_information () - { - symbol_ = SCM_EOL; - function_ = 0; - } -}; - - void add_translator (Translator *trans); Translator *get_translator (SCM s); + +SCM +generic_get_acknowledger (SCM sym, SCM ack_hash); + Moment get_event_length (Stream_event *s, Moment now); Moment get_event_length (Stream_event *s);