#include "callback.hh"
#include "input.hh" // for error reporting
#include "smobs.hh"
+#include "stream-event.hh"
#include "std-vector.hh"
#include "protected-scm.hh"
VIRTUAL_COPY_CONSTRUCTOR (Translator, NAME); \
virtual void fetch_precomputable_methods (SCM methods[]); \
DECLARE_TRANSLATOR_CALLBACKS (NAME); \
- TRANSLATOR_INHERIT (Translator) \
+ TRANSLATOR_INHERIT (Translator); \
/* end #define */
#define TRANSLATOR_INHERIT(BASE) \
- using BASE::method_finder; \
- using BASE::ack_finder;
+ using BASE::method_finder
#define DECLARE_TRANSLATOR_CALLBACKS(NAME) \
template <void (NAME::*mf)()> \
- static SCM method_finder () { return method_find_base<NAME, mf> (); } \
- template <void (NAME::*callback)(Grob_info)> \
- static SCM ack_finder () { return ack_find_base<NAME, callback> (); } \
+ static SCM method_finder () \
+ { \
+ return Callback0_wrapper::make_smob<NAME, mf> (); \
+ } \
+ template <void (NAME::*mf)(Stream_event *)> \
+ static SCM method_finder () \
+ { \
+ return Callback_wrapper::make_smob<trampoline<NAME, mf> > (); \
+ } \
+ template <void (NAME::*mf)(Grob_info)> \
+ static SCM method_finder () { \
+ return Callback2_wrapper::make_smob<trampoline <NAME, mf> > (); \
+ } \
/* end #define */
/*
static Drul_array<Protected_scm> acknowledge_static_array_drul_; \
static SCM static_description_; \
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 SCM get_end_acknowledger (SCM sym) \
+ static SCM static_get_acknowledger (SCM sym, Direction start_end); \
+ virtual SCM get_acknowledger (SCM sym, Direction start_end) \
{ \
- return static_get_end_acknowledger (sym); \
+ return static_get_acknowledger (sym, start_end); \
} \
public: \
- NAME (); \
+ NAME (Context *); \
static void boot (); \
virtual SCM static_translator_description () const; \
virtual SCM translator_description () const; \
} \
/* 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,
public:
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 ();
+ Translator (Context *);
Translator (Translator const &);
SCM internal_get_property (SCM symbol) const;
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;
+ virtual SCM get_acknowledger (SCM sym, Direction start_end) = 0;
protected: // should be private.
Context *daddy_context_;
return SCM_UNSPECIFIED;
}
- template <class T, void (T::*mf)()>
- static SCM
- method_find_base () { return Callback0_wrapper::make_smob<T, mf> (); }
-
// Fallback for non-overriden callbacks for which &T::x degrades to
// &Translator::x
template <void (Translator::*)()>
static SCM
method_finder () { return SCM_UNDEFINED; }
- // Overriden in Engraver.
- template <class T, void (T::*callback)(Grob_info)>
- static SCM
- ack_find_base () { return SCM_UNDEFINED; }
-
- template <void (Translator::*)(Grob_info)>
- static SCM
- ack_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,