X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Ftranslator.hh;h=3769b0e4b837c220d7f3e6078ee5e646eb556a25;hb=729c453ee49e8e43cb582089b208bb62369dced1;hp=54a7f318f77d32c921c82faeec431a69f6deac63;hpb=18d9bcf40f630efefdeb42e3d15653c7aae73ec3;p=lilypond.git diff --git a/lily/include/translator.hh b/lily/include/translator.hh index 54a7f318f7..3769b0e4b8 100644 --- a/lily/include/translator.hh +++ b/lily/include/translator.hh @@ -23,58 +23,59 @@ #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 "std-vector.hh" #include "protected-scm.hh" -/* - Each translator class has a static list of listener records. Each - record makes one explains how to register one of the class's stream event - listeners to a context. -*/ -typedef struct translator_listener_record -{ - Listener (*get_listener_) (void *, SCM event_class); - SCM event_class_; - struct translator_listener_record *next_; +#define TRANSLATOR_FAMILY_DECLARATIONS(NAME) \ + public: \ + VIRTUAL_COPY_CONSTRUCTOR (Translator, NAME); \ + virtual void fetch_precomputable_methods (SCM methods[]); \ + DECLARE_TRANSLATOR_CALLBACKS (NAME); \ + TRANSLATOR_INHERIT (Translator) \ + /* end #define */ - translator_listener_record () - { - next_ = 0; - event_class_ = SCM_EOL; - get_listener_ = 0; - } +#define TRANSLATOR_INHERIT(BASE) \ + using BASE::method_finder; \ + using BASE::ack_finder; -} translator_listener_record; +#define DECLARE_TRANSLATOR_CALLBACKS(NAME) \ + template \ + static SCM method_finder () { return method_find_base (); } \ + template \ + static SCM ack_finder () { return ack_find_base (); } \ + /* end #define */ -#define TRANSLATOR_DECLARATIONS_NO_LISTENER(NAME) \ +/* + Each translator class has a static alist of event class symbols + mapping to callbacks that are called with a translator instance and + a stream event when an event of the appropriate event class is + announced in a context. +*/ + +#define TRANSLATOR_DECLARATIONS(NAME) \ public: \ - NAME (); \ - VIRTUAL_COPY_CONSTRUCTOR (Translator, NAME); \ + TRANSLATOR_FAMILY_DECLARATIONS (NAME); \ + static Drul_array acknowledge_static_array_drul_; \ 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) \ + static Protected_scm listener_list_; \ + static SCM static_get_acknowledger (SCM sym); \ + static SCM static_get_end_acknowledger(SCM); \ + virtual SCM get_acknowledger (SCM sym) \ { \ return static_get_acknowledger (sym); \ } \ - virtual Grob_info_callback get_end_acknowledger (SCM sym) \ + virtual SCM get_end_acknowledger (SCM sym) \ { \ return static_get_end_acknowledger (sym); \ - } \ - /* end #define */ - -#define TRANSLATOR_DECLARATIONS(NAME) \ - TRANSLATOR_DECLARATIONS_NO_LISTENER(NAME) \ -private: \ - static translator_listener_record *listener_list_; \ + } \ public: \ - virtual translator_listener_record *get_listener_list () const \ + NAME (); \ + virtual SCM static_translator_description () const; \ + virtual SCM translator_description () const; \ + virtual SCM get_listener_list () const \ { \ return listener_list_; \ } \ @@ -84,10 +85,7 @@ public: \ public: \ inline void listen_ ## m (Stream_event *); \ /* Should be private */ \ -static void _internal_declare_ ## m (); \ -private: \ - static Listener _get_ ## m ## _listener (void *, SCM); \ -void _listen_scm_ ## m (SCM); +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: @@ -107,13 +105,8 @@ 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 *); - SCM mark_smob (); + int print_smob (SCM, scm_print_state *) const; + SCM mark_smob () const; static const char type_p_name_[]; virtual ~Translator (); private: @@ -122,6 +115,7 @@ private: public: Context *context () const { return daddy_context_; } + Translator (); Translator (Translator const &); SCM internal_get_property (SCM symbol) const; @@ -145,41 +139,67 @@ 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) = 0; + virtual SCM get_end_acknowledger (SCM sym) = 0; protected: // should be private. Context *daddy_context_; void protect_event (SCM ev); + + 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; + } + + template + static SCM + method_find_base () { return Callback0_wrapper::make_smob (); } + + // Fallback for non-overriden callbacks for which &T::x degrades to + // &Translator::x + template + static SCM + method_finder () { return SCM_UNDEFINED; } + + // Overriden in Engraver. + template + static SCM + ack_find_base () { return SCM_UNDEFINED; } + + template + static SCM + ack_finder () { return SCM_UNDEFINED; } + virtual void derived_mark () const; - static void add_translator_listener (translator_listener_record **listener_list, - translator_listener_record *r, - Listener (*get_listener) (void *, SCM), - const char *ev_class); + static SCM event_class_symbol (const char *ev_class); SCM static_translator_description (const char *grobs, const char *desc, - translator_listener_record *listener_list, + SCM listener_list, const char *read, const char *write) const; 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);