X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftranslator.cc;h=e57e1c391af53eec7dc93253da33fe28d5cff8e7;hb=a6a51abfd0195a3cf7d6ea095cf69808852f21ce;hp=d0ed1e52137f7990b7e93307b31a7956f5a3ed21;hpb=a200088f8b69a03e02c466feb7ed45722cd6a2f7;p=lilypond.git diff --git a/lily/translator.cc b/lily/translator.cc index d0ed1e5213..e57e1c391a 100644 --- a/lily/translator.cc +++ b/lily/translator.cc @@ -1,9 +1,20 @@ /* - translator.cc -- implement Translator + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 1997--2015 Han-Wen Nienhuys - (c) 1997--2007 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 + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . */ #include "translator.hh" @@ -16,21 +27,11 @@ #include "warn.hh" #include "translator.icc" -#include "ly-smobs.icc" Translator::~Translator () { } -void -Translator::init () -{ - must_be_last_ = false; - self_scm_ = SCM_EOL; - daddy_context_ = 0; - smobify_self (); -} - void Translator::process_music () { @@ -41,15 +42,10 @@ Translator::process_acknowledged () { } -Translator::Translator () +Translator::Translator (Context *c) + : daddy_context_ (c) { - init (); -} - -Translator::Translator (Translator const &src) -{ - init (); - must_be_last_ = src.must_be_last_; + smobify_self (); } Moment @@ -110,78 +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_); -} + 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_); + 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 *), - 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 = replace_all (&name, '_', '-'); name += "-event"; - - SCM class_sym = scm_str2symbol (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 ()); } /* @@ -189,42 +145,41 @@ 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, - const char *read, - const char *write) const + const char *desc, + SCM listener_list, + const char *read, + const char *write) { - SCM static_properties = SCM_EOL; - - static_properties = scm_acons (ly_symbol2scm ("grobs-created"), - parse_symbol_list (grobs), static_properties); - - static_properties = scm_acons (ly_symbol2scm ("description"), - scm_from_locale_string (desc), static_properties); - + SCM static_properties = SCM_EOL; + + static_properties = scm_acons (ly_symbol2scm ("grobs-created"), + parse_symbol_list (grobs), static_properties); + + static_properties = scm_acons (ly_symbol2scm ("description"), + 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); - - static_properties = scm_acons (ly_symbol2scm ("properties-read"), - parse_symbol_list (read), static_properties); - - static_properties = scm_acons (ly_symbol2scm ("properties-written"), - parse_symbol_list (write), static_properties); - - return static_properties; + list, static_properties); + + static_properties = scm_acons (ly_symbol2scm ("properties-read"), + parse_symbol_list (read), static_properties); + + static_properties = scm_acons (ly_symbol2scm ("properties-written"), + parse_symbol_list (write), static_properties); + + return static_properties; } - + /* 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; } @@ -240,14 +195,12 @@ 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 { - return must_be_last_; + return false; } void @@ -256,51 +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, - char const *func_name, - vector *ack_array) +add_acknowledger (SCM ptr, + char const *func_name, + 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 = 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 @@ -311,7 +257,7 @@ Moment get_event_length (Stream_event *e, Moment now) { Moment len = get_event_length (e); - + if (now.grace_part_) { len.grace_part_ = len.main_part_; @@ -328,21 +274,21 @@ get_event_length (Stream_event *e, Moment now) bool internal_event_assignment (Stream_event **old_ev, Stream_event *new_ev, const char *function) { - if (*old_ev && - !to_boolean (scm_equal_p ((*old_ev)->self_scm (), - new_ev->self_scm ()))) + if (*old_ev + && !to_boolean (scm_equal_p ((*old_ev)->self_scm (), + new_ev->self_scm ()))) { /* extract event class from function name */ string ev_class = function; /* This assertion fails if EVENT_ASSIGNMENT was called outside a - translator listener. Don't do that. */ + translator listener. Don't do that. */ const char *prefix = "listen_"; assert (0 == ev_class.find (prefix)); /* "listen_foo_bar" -> "foo-bar" */ ev_class.erase (0, strlen (prefix)); - replace_all (ev_class, '_', '-'); + replace_all (&ev_class, '_', '-'); new_ev->origin ()->warning (_f ("Two simultaneous %s events, junking this one", ev_class.c_str ())); (*old_ev)->origin ()->warning (_f ("Previous %s event here", ev_class.c_str ())); @@ -355,8 +301,4 @@ internal_event_assignment (Stream_event **old_ev, Stream_event *new_ev, const ch } } -ADD_TRANSLATOR (Translator, - "Base class. Not instantiated.", - "", - "", - ""); +// Base class. Not instantiated. No ADD_TRANSLATOR call.