X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftranslator-group.cc;h=6bda7b9030505e1e86c4b31c3a5853cdaaf3f4e3;hb=1e0b328b0eaf62dc57c6f60463864f2e5cb0e659;hp=a13eb4901b3803190a5208bbf39cef12e8130508;hpb=3a7b6b3cbd35499a0993d46c302f37853f1b9c51;p=lilypond.git diff --git a/lily/translator-group.cc b/lily/translator-group.cc index a13eb4901b..6bda7b9030 100644 --- a/lily/translator-group.cc +++ b/lily/translator-group.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "music-output-def.hh" @@ -16,13 +16,13 @@ #include "translator-def.hh" Translator_group::Translator_group (Translator_group const&s) - : Translator(s) + : Translator (s) { iterator_count_ =0; Scheme_hash_table * tab = new Scheme_hash_table (*s.properties_dict ()); properties_scm_ = tab->self_scm (); - scm_unprotect_object (tab->self_scm( )); + scm_unprotect_object (tab->self_scm ()); } Scheme_hash_table* @@ -34,11 +34,11 @@ Translator_group::properties_dict () const Translator_group::~Translator_group () { - //assert (removable_b()); + //assert (removable_b ()); } -Translator_group::Translator_group() +Translator_group::Translator_group () { iterator_count_ = 0; Scheme_hash_table *tab = new Scheme_hash_table ; @@ -48,7 +48,7 @@ Translator_group::Translator_group() } void -Translator_group::check_removal() +Translator_group::check_removal () { SCM next = SCM_EOL; for (SCM p = trans_group_list_; gh_pair_p (p); p = next) @@ -58,7 +58,7 @@ Translator_group::check_removal() Translator_group *trg = dynamic_cast (unsmob_translator (gh_car (p))); trg->check_removal (); - if (trg->removable_b()) + if (trg->removable_b ()) terminate_translator (trg); } } @@ -70,8 +70,12 @@ Translator_group::add_translator (SCM list, Translator *t) list = gh_append2 (list, gh_cons (t->self_scm (), SCM_EOL)); t->daddy_trans_l_ = this; t->output_def_l_ = output_def_l_; - t->add_processing (); - + if (Translator_group*tg = dynamic_cast (t)) + { + unsmob_translator_def (tg->definition_)->apply_property_operations (tg); + } + + t->initialize (); return list; } void @@ -83,7 +87,7 @@ Translator_group::add_group_translator (Translator *t) bool -Translator_group::removable_b() const +Translator_group::removable_b () const { return trans_group_list_ == SCM_EOL && ! iterator_count_; } @@ -116,7 +120,7 @@ Translator_group::find_create_translator_l (String n, String id) return existing; Link_array path - = unsmob_translator_def (definition_)->path_to_acceptable_translator (ly_str02scm ((char*)n.ch_C()), output_def_l ()); + = unsmob_translator_def (definition_)->path_to_acceptable_translator (ly_str02scm ((char*)n.ch_C ()), output_def_l ()); if (path.size ()) { @@ -149,7 +153,6 @@ bool Translator_group::try_music_on_nongroup_children (Music *m) { bool hebbes_b =false; - for (SCM p = simple_trans_list_; !hebbes_b && gh_pair_p (p); p = gh_cdr (p)) { @@ -159,7 +162,7 @@ Translator_group::try_music_on_nongroup_children (Music *m) } bool -Translator_group::do_try_music (Music* m) +Translator_group::try_music (Music* m) { bool hebbes_b = try_music_on_nongroup_children (m); @@ -169,9 +172,9 @@ Translator_group::do_try_music (Music* m) } int -Translator_group::depth_i() const +Translator_group::depth_i () const { - return (daddy_trans_l_) ? daddy_trans_l_->depth_i() + 1 : 0; + return (daddy_trans_l_) ? daddy_trans_l_->depth_i () + 1 : 0; } Translator_group* @@ -186,7 +189,7 @@ Translator_group::ancestor_l (int level) void Translator_group::terminate_translator (Translator*r_l) { - r_l->removal_processing(); + r_l->removal_processing (); /* Return value ignored. GC does the rest. */ @@ -207,24 +210,6 @@ Translator_group::remove_translator_p (Translator*trans_l) return trans_l; } -#if 0 -/* - should not use, instead: use properties to communicate between engravers. - */ -Translator* -Translator_group::get_simple_translator (String type) const -{ - for (SCM p = simple_trans_list_; gh_pair_p (p); p =gh_cdr (p)) - { - if (classname (unsmob_translator (gh_car (p))) == type) - return unsmob_translator (gh_car (p)); - } - if (daddy_trans_l_) - return daddy_trans_l_->get_simple_translator (type); - return 0; -} -#endif - bool Translator_group::is_bottom_translator_b () const { @@ -233,7 +218,7 @@ Translator_group::is_bottom_translator_b () const } Translator_group* -Translator_group::get_default_interpreter() +Translator_group::get_default_interpreter () { if (!is_bottom_translator_b ()) { @@ -243,7 +228,7 @@ Translator_group::get_default_interpreter() Translator_def *t = unsmob_translator_def (st); if (!t) { - warning (_f ("can't find or create: `%s'", ly_scm2string (nm).ch_C())); + warning (_f ("can't find or create: `%s'", ly_scm2string (nm).ch_C ())); t = unsmob_translator_def (this->definition_); } Translator_group *tg = t->instantiate (output_def_l_); @@ -260,8 +245,8 @@ Translator_group::get_default_interpreter() static void static_each (SCM list, Method_pointer method) { - for (SCM p = list; gh_pair_p (p); p = gh_cdr(p)) - (unsmob_translator (gh_car (p))->*method) (); + for (SCM p = list; gh_pair_p (p); p = gh_cdr (p)) + (unsmob_translator (gh_car (p))->*method) (); } @@ -272,23 +257,6 @@ Translator_group::each (Method_pointer method) static_each (trans_group_list_, method); } -void -Translator_group::do_print() const -{ -#ifndef NPRINT -#endif -} - -void -Translator_group::do_add_processing () -{ - unsmob_translator_def (definition_)->apply_property_operations (this); - for (SCM s = simple_trans_list_; gh_pair_p (s) ; s = gh_cdr (s)) - { - Translator * t = unsmob_translator (gh_car (s)); - t->add_processing (); - } -} /* PROPERTIES @@ -304,32 +272,45 @@ Translator_group::where_defined (SCM sym) const return (daddy_trans_l_) ? daddy_trans_l_->where_defined (sym) : 0; } +/* + return SCM_EOL when not found. +*/ SCM Translator_group::get_property (SCM sym) const { - if (properties_dict ()->elem_b (sym)) - { - return properties_dict ()->get (sym); - } + SCM val =SCM_EOL; + if (properties_dict ()->try_retrieve (sym, &val)) + return val; if (daddy_trans_l_) return daddy_trans_l_->get_property (sym); - return SCM_UNDEFINED; + return val; } void Translator_group::set_property (String id, SCM val) { - set_property (ly_symbol2scm (id.ch_C()), val); + set_property (ly_symbol2scm (id.ch_C ()), val); } + void Translator_group::set_property (SCM sym, SCM val) { properties_dict ()->set (sym, val); } +/* + TODO: look up to check whether we have inherited var? + */ +void +Translator_group::unset_property (SCM sym) +{ + properties_dict ()->remove (sym); +} + + /* Push or pop (depending on value of VAL) a single entry (ELTPROP . VAL) entry from a translator property list by name of PROP @@ -337,21 +318,29 @@ Translator_group::set_property (SCM sym, SCM val) void Translator_group::execute_single_pushpop_property (SCM prop, SCM eltprop, SCM val) { - if (gh_symbol_p(prop)) + if (gh_symbol_p (prop)) { if (val != SCM_UNDEFINED) { SCM prev = get_property (prop); - /* - we don't tack onto SCM_UNDEFINED, because it creates - errors down the line, if we do scm_assoc(). - */ if (gh_pair_p (prev) || prev == SCM_EOL) { + bool ok = type_check_assignment (val, eltprop, ly_symbol2scm ("backend-type?")); + + + + if (ok) + { prev = gh_cons (gh_cons (eltprop, val), prev); set_property (prop, prev); + } } + else + { + // warning here. + } + } else { @@ -381,31 +370,107 @@ Translator_group::execute_single_pushpop_property (SCM prop, SCM eltprop, SCM va STUBS */ void -Translator_group::do_pre_move_processing () +Translator_group::stop_translation_timestep () { - each (&Translator::pre_move_processing); + each (&Translator::stop_translation_timestep); } void -Translator_group::do_post_move_processing () +Translator_group::start_translation_timestep () { - each (&Translator::post_move_processing); + each (&Translator::start_translation_timestep); } void -Translator_group::do_process_music () +Translator_group::do_announces () { - each (&Translator::process_music); + each (&Translator::announces); } void -Translator_group::do_creation_processing () +Translator_group::initialize () { - each (&Translator::creation_processing); + each (&Translator::initialize); } void -Translator_group::do_removal_processing () +Translator_group::finalize () { each (&Translator::removal_processing); } + + +bool +type_check_assignment (SCM val, SCM sym, SCM type_symbol) +{ + bool ok = true; + SCM type_p = SCM_EOL; + + if (gh_symbol_p (sym)) + type_p = scm_object_property (sym, type_symbol); + + if (type_p != SCM_EOL && !gh_procedure_p (type_p)) + { + warning (_f ("Can't find property type-check for `%s'. Perhaps you made a typing error?", + ly_symbol2string (sym).ch_C ())); + } + else + { + if (val != SCM_EOL + && gh_procedure_p (type_p) + && gh_call1 (type_p, val) == SCM_BOOL_F) + { + SCM errport = scm_current_error_port (); + ok = false; + SCM typefunc = scm_eval2 (ly_symbol2scm ("type-name"), SCM_EOL); + SCM type_name = gh_call1 (typefunc, type_p); + + scm_puts (_f ("Type check for `%s' failed; value `%s' must be of type `%s'", + ly_symbol2string (sym).ch_C (), + ly_scm2string (ly_write2scm (val)).ch_C (), + ly_scm2string (type_name).ch_C ()).ch_C (), + errport); + scm_puts ("\n", errport); + } + } + return ok; +} + +SCM +ly_get_trans_property (SCM context, SCM name) +{ + Translator *t = unsmob_translator (context); + Translator_group* tr= dynamic_cast (t); + if (!t || !tr) + { + /* programming_error? */ + warning (_ ("ly-get-trans-property: expecting a Translator_group argument")); + return SCM_EOL; + } + return tr->get_property (name); + +} +SCM +ly_set_trans_property (SCM context, SCM name, SCM val) +{ + + Translator *t = unsmob_translator (context); + Translator_group* tr= dynamic_cast (t); + if (tr) + { + tr->set_property (name, val); + } + return SCM_UNSPECIFIED; +} + + + + +void +add_trans_scm_funcs () +{ + scm_make_gsubr ("ly-get-trans-property", 2, 0, 0, (Scheme_function_unknown)ly_get_trans_property); + scm_make_gsubr ("ly-set-trans-property", 3, 0, 0, (Scheme_function_unknown)ly_set_trans_property); +} + +ADD_SCM_INIT_FUNC (trans_scm, add_trans_scm_funcs);