X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftranslator.cc;h=e57e1c391af53eec7dc93253da33fe28d5cff8e7;hb=5d84bfad4626892bcffd05adcced53c8a2329047;hp=116f2849ac702e33bb6e892dd6d8774f36e26c4b;hpb=c39d188d28fdc84cef8cbaea7b8d6e2fb718c30f;p=lilypond.git diff --git a/lily/translator.cc b/lily/translator.cc index 116f2849ac..e57e1c391a 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--2014 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,20 +27,11 @@ #include "warn.hh" #include "translator.icc" -#include "ly-smobs.icc" Translator::~Translator () { } -void -Translator::init () -{ - self_scm_ = SCM_EOL; - daddy_context_ = 0; - smobify_self (); -} - void Translator::process_music () { @@ -51,15 +42,10 @@ Translator::process_acknowledged () { } -Translator::Translator () -{ - init (); -} - -Translator::Translator (Translator const &src) +Translator::Translator (Context *c) + : daddy_context_ (c) { - (void) src; - init (); + smobify_self (); } Moment @@ -120,48 +106,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); + + c->events_below ()->add_listener (get_listener (callback), + event_class); + } } 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_); -} + 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); -/* - internally called once, statically, for each translator - listener. Connects the name of an event class with a procedure that - fetches the corresponding listener. + c->events_below ()->remove_listener (get_listener (callback), + event_class); + } +} - 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"; - // we make the symbol permanent in order not to have to bother about - // the static translator_listener_record chains while garbage - // collecting. - - SCM class_sym = scm_permanent_object (scm_from_locale_symbol (name.c_str ())); - - 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 ()); } /* @@ -170,9 +146,9 @@ 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 + const char *write) { SCM static_properties = SCM_EOL; @@ -180,11 +156,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); @@ -201,10 +177,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; } @@ -220,9 +195,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 * const Translator::type_p_name_ = "ly:translator?"; bool Translator::must_be_last () const @@ -236,50 +209,44 @@ 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 (SCM ptr, char const *func_name, - vector *ack_array) + SCM &ack_hash) { - Acknowledge_information inf; - inf.function_ = ptr; + if (SCM_UNBNDP (ack_hash)) + ack_hash = Scheme_hash_table::make_smob (); string interface_name (func_name); interface_name = replace_all (&interface_name, '_', '-'); interface_name += "-interface"; - /* - this is only called during program init, so safe to use scm_gc_protect_object () - */ - inf.symbol_ = scm_gc_protect_object (ly_symbol2scm (interface_name.c_str ())); - ack_array->push_back (inf); + unsmob (ack_hash) + ->set (ly_symbol2scm (interface_name.c_str ()), ptr); } -Engraver_void_function_engraver_grob_info -generic_get_acknowledger (SCM sym, vector const *ack_array) +SCM +generic_get_acknowledger (SCM sym, SCM ack_hash) { - for (vsize i = 0; i < ack_array->size (); i++) - { - if (ack_array->at (i).symbol_ == sym) - return ack_array->at (i).function_; - } - return 0; + if (SCM_UNBNDP (ack_hash)) + return SCM_UNDEFINED; + + return unsmob (ack_hash)->get (sym); } 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 @@ -334,16 +301,4 @@ internal_event_assignment (Stream_event **old_ev, Stream_event *new_ev, const ch } } -ADD_TRANSLATOR (Translator, - /* doc */ - "Base class. Not instantiated.", - - /* create */ - "", - - /* read */ - "", - - /* write */ - "" - ); +// Base class. Not instantiated. No ADD_TRANSLATOR call.