From 001580b02c4a839a2b9199355fd7b7c658fb41a9 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Fri, 3 Nov 2006 01:41:04 +0100 Subject: [PATCH] minor cleanups --- lily/include/translator.hh | 9 +++++++++ lily/include/translator.icc | 6 ------ lily/translator.cc | 5 +++-- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/lily/include/translator.hh b/lily/include/translator.hh index b6ec74a729..cf1439e673 100644 --- a/lily/include/translator.hh +++ b/lily/include/translator.hh @@ -144,4 +144,13 @@ void add_translator (Translator *trans); Translator *get_translator (SCM s); Moment get_event_length (Stream_event *s); DECLARE_UNSMOB (Translator, translator); + + +/* + This helper is only meaningful inside listen_* methods. +*/ +extern bool internal_event_assignment (Stream_event **old_ev, Stream_event *new_ev, const char *function); +#define ASSIGN_EVENT_ONCE(o,n) internal_event_assignment (&o, n, __FUNCTION__) + + #endif // TRANSLATOR_HH diff --git a/lily/include/translator.icc b/lily/include/translator.icc index 6eb9e10405..708089b30a 100644 --- a/lily/include/translator.icc +++ b/lily/include/translator.icc @@ -134,10 +134,4 @@ cl::_listen_scm_ ## m (SCM sev) \ listen_ ## m (ev); \ } -/* - This helper is only meaningful inside listen_* methods. -*/ -extern bool internal_event_assignment (Stream_event **old_ev, Stream_event *new_ev, const char *function); -#define ASSIGN_EVENT_ONCE(o,n) internal_event_assignment (&o, n, __FUNCTION__) - #endif /* TRANSLATOR_ICC */ diff --git a/lily/translator.cc b/lily/translator.cc index 7e1518bdc1..b7a46d29b6 100644 --- a/lily/translator.cc +++ b/lily/translator.cc @@ -318,10 +318,11 @@ internal_event_assignment (Stream_event **old_ev, Stream_event *new_ev, const ch new_ev->self_scm ()))) { /* extract event class from function name */ - const char *prefix = "listen_"; string ev_class = function; + /* This assertion fails if EVENT_ASSIGNMENT was called outside a translator listener. Don't do that. */ + const char *prefix = "listen_"; assert (0 == ev_class.find (prefix)); /* "listen_foo_bar" -> "foo-bar" */ @@ -340,7 +341,7 @@ internal_event_assignment (Stream_event **old_ev, Stream_event *new_ev, const ch } ADD_TRANSLATOR (Translator, - "Base class. Unused", + "Base class. Not instantiated.", "", "", ""); -- 2.39.2