X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftranslator-group.cc;h=6bda7b9030505e1e86c4b31c3a5853cdaaf3f4e3;hb=9943c08d29026b5a582e15d661c9a0d0b5e37501;hp=cd7b6e62e9479ec963144b5f3711c119f8189373;hpb=cec6dfa6bf0fb931eb7f42b1ee44ca2ec19a9f34;p=lilypond.git diff --git a/lily/translator-group.cc b/lily/translator-group.cc index cd7b6e62e9..6bda7b9030 100644 --- a/lily/translator-group.cc +++ b/lily/translator-group.cc @@ -3,109 +3,114 @@ source file of the GNU LilyPond music typesetter - (c) 1997 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "music-output-def.hh" #include "translator-group.hh" #include "translator.hh" #include "debug.hh" -#include "pcursor.hh" +#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) { - consists_str_arr_ = s.consists_str_arr_; - accepts_str_arr_ = s.accepts_str_arr_; 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 ()); +} + +Scheme_hash_table* +Translator_group::properties_dict () const +{ + return Scheme_hash_table::unsmob (properties_scm_); } 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 ; + properties_scm_ = tab->self_scm (); + + scm_unprotect_object (tab->self_scm ()); } void -Translator_group::check_removal() +Translator_group::check_removal () { - for (int i =0; i < group_l_arr ().size();) + SCM next = SCM_EOL; + for (SCM p = trans_group_list_; gh_pair_p (p); p = next) { - group_l_arr ()[i]->check_removal(); - if (group_l_arr ()[i]->removable_b()) - terminate_translator (group_l_arr ()[i]); - else - i++; - } -} + next = gh_cdr (p); + Translator_group *trg = dynamic_cast (unsmob_translator (gh_car (p))); + trg->check_removal (); + if (trg->removable_b ()) + terminate_translator (trg); + } +} -IMPLEMENT_IS_TYPE_B1(Translator_group, Translator); +SCM +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_; + if (Translator_group*tg = dynamic_cast (t)) + { + unsmob_translator_def (tg->definition_)->apply_property_operations (tg); + } + + t->initialize (); + return list; +} void -Translator_group::add (Translator *trans_p) +Translator_group::add_group_translator (Translator *t) { - trans_p_list_.bottom().add (trans_p); - trans_p->daddy_trans_l_ = this; - trans_p->output_def_l_ = output_def_l_; - trans_p->add_processing (); + trans_group_list_ = add_translator (trans_group_list_,t); } + + bool -Translator_group::removable_b() const +Translator_group::removable_b () const { - return !(iterator_count_ || group_l_arr ().size()); + return trans_group_list_ == SCM_EOL && ! iterator_count_; } -Translator_group * +Translator_group * Translator_group::find_existing_translator_l (String n, String id) { - if (is_alias_b (n) && (id_str_ == id || !id)) + if (is_alias_b (n) && (id_str_ == id || id.empty_b ())) return this; + Translator_group* r = 0; - for (int i =0; !r && i < group_l_arr ().size(); i++) + for (SCM p = trans_group_list_; !r && gh_pair_p (p); p = gh_cdr (p)) { - r = group_l_arr ()[i]->find_existing_translator_l (n,id); + Translator * t = unsmob_translator (gh_car (p)); + + r = dynamic_cast (t)->find_existing_translator_l (n, id); } - + return r; } -Link_array -Translator_group::path_to_acceptable_translator (String type) const -{ - Link_array retval; - if (type_str_ == type) - { - retval.push (output_def_l ()->find_translator_l (type)->group_l ()); - } - else for (int i=0; i < accepts_str_arr_.size (); i++) - { - Translator *t = output_def_l ()->find_translator_l (accepts_str_arr_[i]); - if (!t || !t->group_l ()) - continue; - - Translator_group * g = t->group_l (); - - Link_array result - = g->path_to_acceptable_translator (type); - if (result.size ()) - { - retval.push (output_def_l ()->find_translator_l (type_str_)->group_l ()); - retval.concat (result); - break; - } - } - return retval; -} Translator_group* Translator_group::find_create_translator_l (String n, String id) @@ -113,52 +118,63 @@ Translator_group::find_create_translator_l (String n, String id) Translator_group * existing = find_existing_translator_l (n,id); if (existing) return existing; - - Link_array path = path_to_acceptable_translator (n); + + Link_array path + = unsmob_translator_def (definition_)->path_to_acceptable_translator (ly_str02scm ((char*)n.ch_C ()), output_def_l ()); if (path.size ()) { Translator_group * current = this; - // start at 1. The first one will be us. - for (int i=1; i < path.size (); i++) + // start at 1. The first one (index 0) will be us. + for (int i=0; i < path.size (); i++) { - Translator_group * new_group = path[i]->clone ()->group_l (); - current->add (new_group); + Translator_group * new_group = path[i]->instantiate (output_def_l_); + + current->add_group_translator (new_group); current = new_group; } current->id_str_ = id; return current; } - - Translator_group * ret =0; + Translator_group *ret = 0; if (daddy_trans_l_) ret = daddy_trans_l_->find_create_translator_l (n,id); - else + else { - warning ("Can't find or create `" + n + "' called `" + id + "'\n"); + warning (_f ("can't find or create `%s' called `%s'", n, id)); ret =0; } return ret; } - bool -Translator_group::do_try_request (Request* req_l) +Translator_group::try_music_on_nongroup_children (Music *m) { bool hebbes_b =false; - for (int i =0; !hebbes_b && i < nongroup_l_arr ().size() ; i++) - hebbes_b =nongroup_l_arr ()[i]->try_request (req_l); + + for (SCM p = simple_trans_list_; !hebbes_b && gh_pair_p (p); p = gh_cdr (p)) + { + hebbes_b = unsmob_translator (gh_car (p))->try_music (m); + } + return hebbes_b; +} + +bool +Translator_group::try_music (Music* m) +{ + bool hebbes_b = try_music_on_nongroup_children (m); + if (!hebbes_b && daddy_trans_l_) - hebbes_b = daddy_trans_l_->try_request (req_l); + hebbes_b = daddy_trans_l_->try_music (m); return hebbes_b ; } 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* @@ -166,163 +182,295 @@ Translator_group::ancestor_l (int level) { if (!level || !daddy_trans_l_) return this; - + return daddy_trans_l_->ancestor_l (level-1); } -Link_array -Translator_group::group_l_arr () const +void +Translator_group::terminate_translator (Translator*r_l) { - Link_array groups; - for (PCursor i (trans_p_list_.top ()); i.ok (); i++) - { - if (i->group_l ()) - groups.push (i->group_l ()); - } - return groups; + r_l->removal_processing (); + /* + Return value ignored. GC does the rest. + */ + remove_translator_p (r_l); +} + + +/** + Remove a translator from the hierarchy. + */ +Translator * +Translator_group::remove_translator_p (Translator*trans_l) +{ + assert (trans_l); + + trans_group_list_ = scm_delq_x (trans_l->self_scm (), trans_group_list_); + trans_l->daddy_trans_l_ = 0; + return trans_l; +} + +bool +Translator_group::is_bottom_translator_b () const +{ + return !gh_string_p (unsmob_translator_def (definition_)->default_child_context_name ()); + } -Link_array -Translator_group::nongroup_l_arr () const +Translator_group* +Translator_group::get_default_interpreter () { - Link_array groups; - for (PCursor i (trans_p_list_.top ()); i.ok (); i++) + if (!is_bottom_translator_b ()) { - if (!i->group_l ()) - groups.push (i.ptr ()); + 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'", ly_scm2string (nm).ch_C ())); + t = unsmob_translator_def (this->definition_); + } + Translator_group *tg = t->instantiate (output_def_l_); + add_group_translator (tg); + + if (!tg->is_bottom_translator_b ()) + return tg->get_default_interpreter (); + else + return tg; } - return groups; + return this; } -void -Translator_group::terminate_translator (Translator*r_l) +static void +static_each (SCM list, Method_pointer method) { - DOUT << "Removing " << r_l->name() << " at " << now_moment () << "\n"; - r_l->removal_processing(); - Translator * trans_p =remove_translator_p (r_l); + for (SCM p = list; gh_pair_p (p); p = gh_cdr (p)) + (unsmob_translator (gh_car (p))->*method) (); - delete trans_p; } -Translator * -Translator_group::remove_translator_p (Translator*trans_l) +void +Translator_group::each (Method_pointer method) { - PCursor trans_cur (trans_p_list_.find (trans_l)); - return trans_cur.remove_p(); + static_each (simple_trans_list_, method); + static_each (trans_group_list_, method); } -Translator* -Translator_group::get_simple_translator (char const *type) const +/* + PROPERTIES + */ +Translator_group* +Translator_group::where_defined (SCM sym) const { - for (int i=0; i < nongroup_l_arr ().size(); i++) + if (properties_dict ()->elem_b (sym)) { - if (nongroup_l_arr ()[i]->name() == type) - return nongroup_l_arr ()[i]; + return (Translator_group*)this; } - if (daddy_trans_l_) - return daddy_trans_l_->get_simple_translator (type); - return 0; -} + return (daddy_trans_l_) ? daddy_trans_l_->where_defined (sym) : 0; +} -bool -Translator_group::is_bottom_translator_b () const +/* + return SCM_EOL when not found. +*/ +SCM +Translator_group::get_property (SCM sym) const { - return !accepts_str_arr_.size (); + 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 val; } +void +Translator_group::set_property (String id, SCM val) +{ + set_property (ly_symbol2scm (id.ch_C ()), val); +} -Translator_group* -Translator_group::get_default_interpreter() +void +Translator_group::set_property (SCM sym, SCM val) { - if (accepts_str_arr_.size()) - { - Translator*t = output_def_l ()->find_translator_l (accepts_str_arr_[0]); - Translator_group * g= t->clone ()->group_l (); - add (g); - - if (!g->is_bottom_translator_b ()) - return g->get_default_interpreter (); - else - return g; - } - return this; + properties_dict ()->set (sym, val); } +/* + TODO: look up to check whether we have inherited var? + */ void -Translator_group::each (Method_pointer method) const +Translator_group::unset_property (SCM sym) { - for (PCursor i (trans_p_list_.top ()); i.ok (); i++) - (i.ptr()->*method) (); + 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 +*/ void -Translator_group::do_print() const +Translator_group::execute_single_pushpop_property (SCM prop, SCM eltprop, SCM val) { -#ifndef NPRINT - if (!check_debug) - return ; - if (status == ORPHAN) - { - DOUT << "consists of: "; - for (int i=0; i < consists_str_arr_.size (); i++) - DOUT << consists_str_arr_[i] << ", "; - DOUT << "\naccepts: "; - for (int i=0; i < accepts_str_arr_.size (); i++) - DOUT << accepts_str_arr_[i] << ", "; - } - else + if (gh_symbol_p (prop)) { - if (id_str_) - DOUT << "ID: " << id_str_ ; - DOUT << " iterators: " << iterator_count_<< "\n"; + if (val != SCM_UNDEFINED) + { + SCM prev = get_property (prop); + + 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 + { + SCM prev = get_property (prop); + + SCM newprops= SCM_EOL ; + while (gh_pair_p (prev) && gh_caar (prev) != eltprop) + { + newprops = gh_cons (gh_car (prev), newprops); + prev = gh_cdr (prev); + } + + if (gh_pair_p (prev)) + { + newprops = scm_reverse_x (newprops, gh_cdr (prev)); + set_property (prop, newprops); + } + } } - each (&Translator::print); -#endif } + + + + +/* + 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_requests () +Translator_group::do_announces () { - each (&Translator::process_requests); + 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); } -void -Translator_group::add_processing () + +bool +type_check_assignment (SCM val, SCM sym, SCM type_symbol) { - Translator::add_processing (); - for (int i=0; i < consists_str_arr_.size(); i++) + 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 { - Translator * t = output_def_l ()->find_translator_l (consists_str_arr_[i]); - if (!t) - warning ("Could not find `" +consists_str_arr_[i]+ "'"); - else - add (t->clone ()); + 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);