X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Ftranslator.cc;h=370f7771c0dcf2a95148ee964b97f4ccd00eb284;hb=refs%2Ftags%2Frelease%2F2.19.38-1;hp=f101fb90e1754188066e587c624b53707e7dcc80;hpb=4a401ca1c60f428daa242dbdd102fdb3f327ebfb;p=lilypond.git diff --git a/lily/translator.cc b/lily/translator.cc index f101fb90e1..370f7771c0 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--2011 Han-Wen Nienhuys + Copyright (C) 1997--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 @@ -27,7 +27,6 @@ #include "warn.hh" #include "translator.icc" -#include "ly-smobs.icc" Translator::~Translator () { @@ -36,7 +35,6 @@ Translator::~Translator () void Translator::init () { - self_scm_ = SCM_EOL; daddy_context_ = 0; smobify_self (); } @@ -56,9 +54,9 @@ Translator::Translator () init (); } -Translator::Translator (Translator const &src) +Translator::Translator (Translator const &) + : Smob () { - (void) src; init (); } @@ -120,78 +118,38 @@ Translator::finalize () void Translator::connect_to_context (Context *c) { - for (translator_listener_record *r = get_listener_list (); r; r = r->next_) - c->events_below ()->add_listener (r->get_listener_ (this, r->event_class_), - r->event_class_); -} + for (SCM r = get_listener_list (); scm_is_pair (r); r = scm_cdr (r)) + { + SCM event_class = scm_caar (r); + SCM callback = scm_cdar (r); -void -Translator::disconnect_from_context (Context *c) -{ - for (translator_listener_record *r = get_listener_list (); r; r = r->next_) - c->events_below ()->remove_listener (r->get_listener_ (this, r->event_class_), - r->event_class_); + c->events_below ()->add_listener (get_listener (callback), + 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?") +Translator::disconnect_from_context (Context *c) { - ensure_listened_hash (); - return scm_hashq_ref (listened_event_class_table, sym, SCM_BOOL_F); -} + for (SCM r = get_listener_list (); scm_is_pair (r); r = scm_cdr (r)) + { + SCM event_class = scm_caar (r); + SCM callback = scm_cdar (r); -void -add_listened_event_class (SCM sym) -{ - ensure_listened_hash (); - scm_hashq_set_x (listened_event_class_table, sym, SCM_BOOL_T); + c->events_below ()->remove_listener (get_listener (callback), + event_class); + } } -/* - internally called once, statically, for each translator - listener. Connects the name of an event class with a procedure that - fetches the corresponding listener. - - The method should only be called from the macro - IMPLEMENT_TRANSLATOR_LISTENER. - */ -void -Translator::add_translator_listener (translator_listener_record **listener_list, - translator_listener_record *r, - Listener (*get_listener) (void *, SCM), - const char *ev_class) +SCM +Translator::event_class_symbol (const char *ev_class) { /* ev_class is the C++ identifier name. Convert to scm symbol */ string name = string (ev_class); name = replace_all (&name, '_', '-'); name += "-event"; - SCM class_sym = scm_from_locale_symbol (name.c_str ()); - - add_listened_event_class (class_sym); - - r->event_class_ = class_sym; - r->get_listener_ = get_listener; - r->next_ = *listener_list; - *listener_list = r; + return scm_from_ascii_symbol (name.c_str ()); } /* @@ -200,7 +158,7 @@ Translator::add_translator_listener (translator_listener_record **listener_list, SCM Translator::static_translator_description (const char *grobs, const char *desc, - translator_listener_record *listener_list, + SCM listener_list, const char *read, const char *write) const { @@ -210,11 +168,11 @@ Translator::static_translator_description (const char *grobs, parse_symbol_list (grobs), static_properties); static_properties = scm_acons (ly_symbol2scm ("description"), - scm_from_locale_string (desc), static_properties); + scm_from_utf8_string (desc), static_properties); SCM list = SCM_EOL; - for (; listener_list; listener_list = listener_list->next_) - list = scm_cons (listener_list->event_class_, list); + for (; scm_is_pair (listener_list); listener_list = scm_cdr (listener_list)) + list = scm_cons (scm_caar (listener_list), list); static_properties = scm_acons (ly_symbol2scm ("events-accepted"), list, static_properties); @@ -231,10 +189,9 @@ Translator::static_translator_description (const char *grobs, SMOBS */ SCM -Translator::mark_smob (SCM sm) +Translator::mark_smob () const { - Translator *me = (Translator *) SCM_CELL_WORD_1 (sm); - me->derived_mark (); + derived_mark (); return SCM_EOL; } @@ -250,9 +207,7 @@ Translator::get_score_context () const return daddy_context_->get_score_context (); } -IMPLEMENT_SMOBS (Translator); -IMPLEMENT_DEFAULT_EQUAL_P (Translator); -IMPLEMENT_TYPE_P (Translator, "ly:translator?"); +const char Translator::type_p_name_[] = "ly:translator?"; bool Translator::must_be_last () const @@ -266,17 +221,16 @@ Translator::derived_mark () const } int -Translator::print_smob (SCM s, SCM port, scm_print_state *) +Translator::print_smob (SCM port, scm_print_state *) const { - Translator *me = (Translator *) SCM_CELL_WORD_1 (s); scm_puts ("#class_name (), port); + scm_puts (class_name (), port); scm_puts (" >", port); return 1; } void -add_acknowledger (Engraver_void_function_engraver_grob_info ptr, +add_acknowledger (Translator::Grob_info_callback ptr, char const *func_name, vector *ack_array) { @@ -295,7 +249,7 @@ add_acknowledger (Engraver_void_function_engraver_grob_info ptr, ack_array->push_back (inf); } -Engraver_void_function_engraver_grob_info +Translator::Grob_info_callback generic_get_acknowledger (SCM sym, vector const *ack_array) { for (vsize i = 0; i < ack_array->size (); i++) @@ -309,7 +263,7 @@ generic_get_acknowledger (SCM sym, vector const *ack_ar Moment get_event_length (Stream_event *e) { - Moment *m = unsmob_moment (e->get_property ("length")); + Moment *m = unsmob (e->get_property ("length")); if (m) return *m; else