X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftranslator-group.cc;h=6bda7b9030505e1e86c4b31c3a5853cdaaf3f4e3;hb=1e0b328b0eaf62dc57c6f60463864f2e5cb0e659;hp=74cee77b61d95d1368b12c81c0b095da68ac915e;hpb=422004486569407b8809da7f3c7053c1e4767bff;p=lilypond.git diff --git a/lily/translator-group.cc b/lily/translator-group.cc index 74cee77b61..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" @@ -13,15 +13,16 @@ #include "moment.hh" #include "scm-hash.hh" #include "killing-cons.tcc" +#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* @@ -32,11 +33,12 @@ 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 ; @@ -46,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) @@ -56,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); } } @@ -68,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 @@ -81,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_; } @@ -103,45 +109,8 @@ Translator_group::find_existing_translator_l (String n, String id) return r; } -Link_array -Translator_group::path_to_acceptable_translator (String type, Music_output_def* odef) const -{ - Link_array accepted_arr; - for (SCM s = accepts_name_list_; gh_pair_p (s); s = gh_cdr (s)) - { - - Translator *t = odef->find_translator_l (ly_scm2string (gh_car (s))); - if (!t || !dynamic_cast (t)) - continue; - accepted_arr.push (dynamic_cast (t)); - } - for (int i=0; i < accepted_arr.size (); i++) - if (accepted_arr[i]->type_str_ == type) - { - Link_array retval; - retval.push (accepted_arr[i]); - return retval; - } - - Link_array best_result; - int best_depth= INT_MAX; - for (int i=0; i < accepted_arr.size (); i++) - { - Translator_group * g = accepted_arr[i]; - - Link_array result - = g->path_to_acceptable_translator (type, odef); - if (result.size () && result.size () < best_depth) - { - result.insert (g,0); - best_result = result; - } - } - - return best_result; -} Translator_group* Translator_group::find_create_translator_l (String n, String id) @@ -150,8 +119,8 @@ Translator_group::find_create_translator_l (String n, String id) if (existing) return existing; - Link_array path - = path_to_acceptable_translator (n, output_def_l ()); + Link_array path + = unsmob_translator_def (definition_)->path_to_acceptable_translator (ly_str02scm ((char*)n.ch_C ()), output_def_l ()); if (path.size ()) { @@ -160,7 +129,7 @@ Translator_group::find_create_translator_l (String n, String id) // start at 1. The first one (index 0) will be us. for (int i=0; i < path.size (); i++) { - Translator_group * new_group = dynamic_cast(path[i]->clone ()); + Translator_group * new_group = path[i]->instantiate (output_def_l_); current->add_group_translator (new_group); current = new_group; @@ -184,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)) { @@ -194,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); @@ -204,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* @@ -221,11 +189,11 @@ Translator_group::ancestor_l (int level) void Translator_group::terminate_translator (Translator*r_l) { - r_l->removal_processing(); - Translator * trans_p =remove_translator_p (r_l); + r_l->removal_processing (); /* - forget trans_p, GC does the rest. + Return value ignored. GC does the rest. */ + remove_translator_p (r_l); } @@ -242,51 +210,34 @@ 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 { - return accepts_name_list_ == SCM_EOL; -} - + return !gh_string_p (unsmob_translator_def (definition_)->default_child_context_name ()); +} Translator_group* -Translator_group::get_default_interpreter() +Translator_group::get_default_interpreter () { - if (gh_pair_p (accepts_name_list_)) + if (!is_bottom_translator_b ()) { - String str = ly_scm2string (gh_car (accepts_name_list_)); - Translator*t = output_def_l ()->find_translator_l (str); + SCM nm = unsmob_translator_def (definition_)->default_child_context_name (); + SCM st = output_def_l ()->find_translator_l (nm); + + Translator_def *t = unsmob_translator_def (st); if (!t) { - warning (_f ("can't find or create: `%s'", str)); - t = this; + warning (_f ("can't find or create: `%s'", ly_scm2string (nm).ch_C ())); + t = unsmob_translator_def (this->definition_); } - Translator_group * g= dynamic_cast (t->clone ()); - add_group_translator (g); + Translator_group *tg = t->instantiate (output_def_l_); + add_group_translator (tg); - if (!g->is_bottom_translator_b ()) - return g->get_default_interpreter (); + if (!tg->is_bottom_translator_b ()) + return tg->get_default_interpreter (); else - return g; + return tg; } return this; } @@ -294,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) (); } @@ -306,67 +257,6 @@ Translator_group::each (Method_pointer method) static_each (trans_group_list_, method); } -void -Translator_group::do_print() const -{ -#ifndef NPRINT -#endif -} - -static SCM -trans_list (SCM namelist, Music_output_def *mdef) -{ - SCM l = SCM_EOL; - for (SCM s = namelist; gh_pair_p (s) ; s = gh_cdr (s)) - { - Translator * t = mdef->find_translator_l (ly_scm2string (gh_car (s))); - if (!t) - warning (_f ("can't find: `%s'", s)); - else - { - Translator * tr = t->clone (); - SCM str = tr->self_scm (); - l = gh_cons (str, l); - scm_unprotect_object (str); - } - } - return l; -} - - -void -Translator_group::do_add_processing () -{ - assert (simple_trans_list_== SCM_EOL); - - SCM correct_order = scm_reverse (property_pushes_); // pity of the mem. - for (SCM s = correct_order; gh_pair_p (s); s = gh_cdr (s)) - { - SCM entry = gh_car (s); - SCM val = gh_cddr (entry); - val = gh_pair_p (val) ? gh_car (val) : SCM_UNDEFINED; - - Translator_group_initializer::apply_pushpop_property (this, gh_car (entry), - gh_cadr (entry), - val); - } - - SCM l1 = trans_list (consists_name_list_, output_def_l ()); - SCM l2 =trans_list (end_consists_name_list_, output_def_l ()); - l1 = scm_reverse_x (l1, l2); - - simple_trans_list_ = l1; - for (SCM s = l1; gh_pair_p (s) ; s = gh_cdr (s)) - { - Translator * t = unsmob_translator (gh_car (s)); - - t->daddy_trans_l_ = this; - t->output_def_l_ = output_def_l_; - t->add_processing (); - } - - -} /* PROPERTIES @@ -382,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 @@ -415,14 +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); - prev = gh_cons (gh_cons (eltprop, val), prev); - set_property (prop, prev); + 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 { @@ -452,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);