/* end define */
#define DEFINE_TRANSLATOR_LISTENER_LIST(T) \
- translator_listener_record *T::listener_list_; \
+ Protected_scm T::listener_list_ (SCM_EOL); \
/* end define */
#define DEFINE_ACKNOWLEDGERS(classname) \
- Drul_array< vector<Acknowledge_information> > classname::acknowledge_static_array_drul_; \
+ Drul_array< std::vector<Acknowledge_information> > classname::acknowledge_static_array_drul_; \
Translator::Grob_info_callback \
classname::static_get_acknowledger (SCM sym) \
{ \
void add_acknowledger (Translator::Grob_info_callback ptr,
char const *func_name,
- vector<Acknowledge_information> *ack_array);
+ std::vector<Acknowledge_information> *ack_array);
Translator::Grob_info_callback
generic_get_acknowledger (SCM sym,
- vector<Acknowledge_information> const *ack_array);
+ std::vector<Acknowledge_information> const *ack_array);
#define ADD_ACKNOWLEDGER(CLASS, NAME) \
void CLASS ## NAME ## _ack_adder () \
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 (cl, _listen_scm_ ## m); \
-} \
- \
-void \
-cl::_listen_scm_ ## m (SCM sev) \
-{ \
- Stream_event *ev = Stream_event::unsmob (sev); \
- protect_event (sev); \
- listen_ ## m (ev); \
-}
+ 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);
#endif /* TRANSLATOR_ICC */