X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftranslator.cc;h=116f2849ac702e33bb6e892dd6d8774f36e26c4b;hb=9e781b7dc83b60a543ce218aa1a5f139f74c760f;hp=a35a1a1d24ad7ecb1137997fc2e625c8f5d691a8;hpb=08560a1b8076630c4fc6cb9b902614d8b74fd6fc;p=lilypond.git diff --git a/lily/translator.cc b/lily/translator.cc index a35a1a1d24..116f2849ac 100644 --- a/lily/translator.cc +++ b/lily/translator.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1997--2012 Han-Wen Nienhuys + Copyright (C) 1997--2014 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 @@ -133,38 +133,6 @@ Translator::disconnect_from_context (Context *c) r->event_class_); } -static SCM listened_event_class_table; -void -ensure_listened_hash () -{ - if (!listened_event_class_table) - listened_event_class_table = scm_permanent_object (scm_c_make_hash_table (61)); -} - -LY_DEFINE (ly_get_listened_event_classes, "ly:get-listened-event-classes", - 0, 0, 0, (), - "Return a list of all event classes that some translator listens" - " to.") -{ - ensure_listened_hash (); - return ly_hash_table_keys (listened_event_class_table); -} - -LY_DEFINE (ly_is_listened_event_class, "ly:is-listened-event-class", - 1, 0, 0, (SCM sym), - "Is @var{sym} a listened event class?") -{ - ensure_listened_hash (); - return scm_hashq_ref (listened_event_class_table, sym, SCM_BOOL_F); -} - -void -add_listened_event_class (SCM sym) -{ - ensure_listened_hash (); - scm_hashq_set_x (listened_event_class_table, sym, SCM_BOOL_T); -} - /* internally called once, statically, for each translator listener. Connects the name of an event class with a procedure that @@ -184,9 +152,11 @@ Translator::add_translator_listener (translator_listener_record **listener_list, name = replace_all (&name, '_', '-'); name += "-event"; - SCM class_sym = scm_from_locale_symbol (name.c_str ()); + // we make the symbol permanent in order not to have to bother about + // the static translator_listener_record chains while garbage + // collecting. - add_listened_event_class (class_sym); + SCM class_sym = scm_permanent_object (scm_from_locale_symbol (name.c_str ())); r->event_class_ = class_sym; r->get_listener_ = get_listener;