X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Ftranslator.icc;h=80a7466cd18c0a6e4a41d3bfebd57143890a1f96;hb=3af0951f9a11677240efa6228683dd4fcea13eaf;hp=4ce8f6902e2fb5a451852389ba6869e00d6d9843;hpb=652ed35a2013489d0a14fede6307cd2595abb2c4;p=lilypond.git diff --git a/lily/include/translator.icc b/lily/include/translator.icc index 4ce8f6902e..80a7466cd1 100644 --- a/lily/include/translator.icc +++ b/lily/include/translator.icc @@ -1,7 +1,7 @@ -/* +/* -*- c++ -*- This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 2005--2012 Han-Wen Nienhuys + Copyright (C) 2005--2015 Han-Wen Nienhuys LilyPond is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -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) \ - translator_listener_record *T::listener_list_; \ - /* end define */ + Protected_scm T::listener_list_ (SCM_EOL) #define DEFINE_ACKNOWLEDGERS(classname) \ - Drul_array< vector > classname::acknowledge_static_array_drul_; \ - Engraver_void_function_engraver_grob_info \ - classname::static_get_acknowledger (SCM sym) \ - { \ - return generic_get_acknowledger (sym, &acknowledge_static_array_drul_[START]); \ - } \ - Engraver_void_function_engraver_grob_info \ - classname::static_get_end_acknowledger (SCM sym) \ + Drul_array 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,88 +70,58 @@ #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_void_method_ptr ptrs[]) \ + T::fetch_precomputable_methods (SCM ptrs[]) \ { \ ptrs[START_TRANSLATION_TIMESTEP] = \ - ((Translator_void_method_ptr) & T::start_translation_timestep == \ - (Translator_void_method_ptr) & Translator::start_translation_timestep) \ - ? 0 \ - : (Translator_void_method_ptr) & T::start_translation_timestep; \ - \ - ptrs[STOP_TRANSLATION_TIMESTEP] = \ - ((Translator_void_method_ptr) & T::stop_translation_timestep == (Translator_void_method_ptr) & Translator::stop_translation_timestep) \ - ? 0 \ - : (Translator_void_method_ptr) & T::stop_translation_timestep; \ + method_finder <&T::start_translation_timestep> (); \ + \ + ptrs[STOP_TRANSLATION_TIMESTEP] = \ + method_finder <&T::stop_translation_timestep> (); \ \ - ptrs[PROCESS_MUSIC] = \ - ((Translator_void_method_ptr) & T::process_music == (Translator_void_method_ptr) & Translator::process_music) \ - ? 0 \ - : (Translator_void_method_ptr) & T::process_music; \ - \ - ptrs[PROCESS_ACKNOWLEDGED] = \ - ((Translator_void_method_ptr) & T::process_acknowledged == (Translator_void_method_ptr) & Translator::process_acknowledged) \ - ? 0 \ - : (Translator_void_method_ptr) & T::process_acknowledged; \ + ptrs[PROCESS_MUSIC] = \ + method_finder <&T::process_music> (); \ + \ + ptrs[PROCESS_ACKNOWLEDGED] = \ + method_finder <&T::process_acknowledged> (); \ } -void add_acknowledger (Engraver_void_function_engraver_grob_info ptr, +void add_acknowledger (SCM ptr, char const *func_name, - vector *ack_array); + SCM &ack_hash); -Engraver_void_function_engraver_grob_info -generic_get_acknowledger (SCM sym, - vector const *ack_array); +#define ADD_ACKNOWLEDGER_FOR(CLASS, NAME, GROB) \ + add_acknowledger (method_finder<&CLASS::acknowledge_ ## NAME> (), \ + #GROB, acknowledge_static_array_drul_[START]) -#define ADD_ACKNOWLEDGER(CLASS, NAME) \ - void CLASS ## NAME ## _ack_adder () \ - { \ - add_acknowledger ((Engraver_void_function_engraver_grob_info) & CLASS::acknowledge_ ## NAME, #NAME, &CLASS::acknowledge_static_array_drul_[START]); \ - } \ - ADD_SCM_INIT_FUNC (CLASS ## NAME ## _ack_adder_initclass, CLASS ## NAME ## _ack_adder); +#define ADD_ACKNOWLEDGER(CLASS, NAME) ADD_ACKNOWLEDGER_FOR (CLASS, NAME, NAME) -#define ADD_END_ACKNOWLEDGER(CLASS, NAME) \ - void CLASS ## NAME ## _end_ack_adder () \ - { \ - add_acknowledger ((Engraver_void_function_engraver_grob_info) & 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); +// ADD_END_ACKNOWLEDGER_FOR requires your NAME to actually be +// end_whatever if you are utilizing acknowledge_end_whatever as a +// different end acknowledger. +#define ADD_END_ACKNOWLEDGER_FOR(CLASS, NAME, GROB) \ + add_acknowledger (method_finder<&CLASS::acknowledge_ ## NAME> (), \ + #GROB, acknowledge_static_array_drul_[STOP]) + +#define ADD_END_ACKNOWLEDGER(CLASS, NAME) \ + ADD_END_ACKNOWLEDGER_FOR (CLASS, end_ ## NAME, NAME) /* 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 () \ -{ \ - static translator_listener_record r; \ - add_translator_listener (&listener_list_, &r, _get_ ## m ## _listener, #m); \ -} \ - \ -ADD_SCM_INIT_FUNC (cl ## _declare_event_ ## m, cl::_internal_declare_ ## m); \ - \ -Listener \ - cl :: _get_ ## m ## _listener (void *me, SCM unused) \ -{ \ - cl *obj = (cl *) me; \ - (void) unused; \ - return obj->GET_LISTENER (_listen_scm_ ## m); \ -} \ - \ -IMPLEMENT_LISTENER (cl, _listen_scm_ ## m) \ -void \ -cl::_listen_scm_ ## m (SCM sev) \ -{ \ - Stream_event *ev = unsmob_stream_event (sev); \ - protect_event (sev); \ - listen_ ## m (ev); \ -} +#define ADD_LISTENER_FOR(cl, m, ev) \ + listener_list_ = scm_acons \ + (event_class_symbol (#ev), \ + method_finder<&cl::listen_ ## m> (), \ + listener_list_) + +#define ADD_LISTENER(cl, m) ADD_LISTENER_FOR (cl, m, m) #endif /* TRANSLATOR_ICC */