X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftranslator-group.cc;h=6dbe4eb65c5037953f79bfc34a8aa0fa8eea633c;hb=9dd8f2b4e9efe7cd09bd5e2fa195dbc58b78f57f;hp=b91f254c3885ef9a26144199eaa8df4b005c49ac;hpb=c3e003dacb5689ffe384d3a2f2d5dc2afb9439bb;p=lilypond.git diff --git a/lily/translator-group.cc b/lily/translator-group.cc index b91f254c38..6dbe4eb65c 100644 --- a/lily/translator-group.cc +++ b/lily/translator-group.cc @@ -3,128 +3,134 @@ source file of the GNU LilyPond music typesetter - (c) 1997 Han-Wen Nienhuys + (c) 1997--2003 Han-Wen Nienhuys */ #include "music-output-def.hh" #include "translator-group.hh" #include "translator.hh" -#include "debug.hh" -#include "pcursor.hh" -#include "rational.hh" +#include "warn.hh" +#include "moment.hh" +#include "scm-hash.hh" +#include "translator-def.hh" +#include "main.hh" +#include "music.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_gc_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_gc_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 = ly_cdr (p); + + Translator_group *trg = dynamic_cast (unsmob_translator (ly_car (p))); + + trg->check_removal (); + if (trg->removable_b ()) + terminate_translator (trg); } } +SCM +Translator_group::add_translator (SCM list, Translator *t) +{ + /* + Must append, since list ordering must be preserved. + */ + list = gh_append2 (list, gh_cons (t->self_scm (), SCM_EOL)); + t->daddy_trans_ = this; + t->output_def_ = output_def_; + + return list; +} + +void +Translator_group::add_used_group_translator (Translator *t) +{ + trans_group_list_ = add_translator (trans_group_list_,t); +} -IMPLEMENT_IS_TYPE_B1(Translator_group, Translator); void -Translator_group::add (Translator *trans_p) +Translator_group::add_fresh_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 (); + Translator_group*tg = dynamic_cast (t); + assert (tg); + + trans_group_list_ = add_translator (trans_group_list_,t); + unsmob_translator_def (tg->definition_)->apply_property_operations (tg); + t->initialize (); + } + 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::find_existing_translator_l (String n, String id) +Translator_group::find_existing_translator (String n, String id) { - if (is_alias_b (n) && (id_str_ == id || id.empty_b ())) + if ((is_alias_b (n) && (id_string_ == id || id.empty_b ())) || n == "Current") 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 = ly_cdr (p)) { - r = group_l_arr ()[i]->find_existing_translator_l (n,id); + Translator * t = unsmob_translator (ly_car (p)); + + r = dynamic_cast (t)->find_existing_translator (n, id); } return r; } -Link_array -Translator_group::path_to_acceptable_translator (String type) const -{ - Link_array accepted_arr; - 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; - accepted_arr.push (t->group_l()); - } - - - 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); - 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) +Translator_group::find_create_translator (String n, String id) { - Translator_group * existing = find_existing_translator_l (n,id); + Translator_group * existing = find_existing_translator (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 (scm_makfrom0str ((char*)n.to_str0 ()), get_output_def ()); if (path.size ()) { @@ -133,220 +139,322 @@ 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 = path[i]->clone ()->group_l (); - current->add (new_group); + Translator_group * new_group = path[i]->instantiate (output_def_); + + if (i == path.size () -1) + new_group->id_string_ = id; + current->add_fresh_group_translator (new_group); current = new_group; } - current->id_str_ = id; + return current; } Translator_group *ret = 0; - if (daddy_trans_l_) - ret = daddy_trans_l_->find_create_translator_l (n,id); + if (daddy_trans_) + ret = daddy_trans_->find_create_translator (n,id); 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 (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); - if (!hebbes_b && daddy_trans_l_) - hebbes_b = daddy_trans_l_->try_request (req_l); + bool hebbes_b = try_music_on_nongroup_children (m); + + if (!hebbes_b && daddy_trans_) + hebbes_b = daddy_trans_->try_music (m); return hebbes_b ; } int -Translator_group::depth_i() const +Translator_group::get_depth () const { - return (daddy_trans_l_) ? daddy_trans_l_->depth_i() + 1 : 0; + return (daddy_trans_) ? daddy_trans_->get_depth () + 1 : 0; } Translator_group* -Translator_group::ancestor_l (int level) +Translator_group::get_ancestor (int level) { - if (!level || !daddy_trans_l_) + if (!level || !daddy_trans_) return this; - return daddy_trans_l_->ancestor_l (level-1); + return daddy_trans_->get_ancestor (level-1); } -Link_array -Translator_group::group_l_arr () const +void +Translator_group::terminate_translator (Translator*r) { - 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->removal_processing (); + /* + Return value ignored. GC does the rest. + */ + remove_translator (r); } -Link_array -Translator_group::nongroup_l_arr () const -{ - Link_array groups; - for (PCursor i (trans_p_list_.top ()); i.ok (); i++) - { - if (!i->group_l ()) - groups.push (i.ptr ()); - } - return groups; -} -void -Translator_group::terminate_translator (Translator*r_l) +/** + Remove a translator from the hierarchy. + */ +Translator * +Translator_group::remove_translator (Translator*trans) { - DOUT << "Removing " << r_l->name() << " at " << now_moment () << "\n"; - r_l->removal_processing(); - Translator * trans_p =remove_translator_p (r_l); + assert (trans); - delete trans_p; + trans_group_list_ = scm_delq_x (trans->self_scm (), trans_group_list_); + trans->daddy_trans_ = 0; + return trans; } -Translator * -Translator_group::remove_translator_p (Translator*trans_l) +bool +Translator_group::is_bottom_translator_b () const { - assert (trans_l); - - PCursor trans_cur (trans_p_list_.find (trans_l)); - Translator * t = trans_cur.remove_p(); - /* - For elegant design, we would do this too. Alas, it does not work yet.. - - t-> removal_processing (); - */ - t-> daddy_trans_l_ = 0; - return t; + return !gh_string_p (unsmob_translator_def (definition_)->default_child_context_name ()); } - -Translator* -Translator_group::get_simple_translator (char const *type) const +Translator_group* +Translator_group::get_default_interpreter () { - for (int i=0; i < nongroup_l_arr ().size(); i++) + if (!is_bottom_translator_b ()) { - if (nongroup_l_arr ()[i]->name() == type) - return nongroup_l_arr ()[i]; + SCM nm = unsmob_translator_def (definition_)->default_child_context_name (); + SCM st = get_output_def ()->find_translator (nm); + + Translator_def *t = unsmob_translator_def (st); + if (!t) + { + warning (_f ("can't find or create: `%s'", ly_scm2string (nm).to_str0 ())); + t = unsmob_translator_def (this->definition_); + } + Translator_group *tg = t->instantiate (output_def_); + add_fresh_group_translator (tg); + + if (!tg->is_bottom_translator_b ()) + return tg->get_default_interpreter (); + else + return tg; } - if (daddy_trans_l_) - return daddy_trans_l_->get_simple_translator (type); - return 0; + return this; } - -bool -Translator_group::is_bottom_translator_b () const +static void +static_each (SCM list, Method_pointer method) { - return !accepts_str_arr_.size (); + for (SCM p = list; gh_pair_p (p); p = ly_cdr (p)) + (unsmob_translator (ly_car (p))->*method) (); + } +void +Translator_group::each (Method_pointer method) +{ + static_each (simple_trans_list_, method); + static_each (trans_group_list_, method); +} +/* + PROPERTIES + */ Translator_group* -Translator_group::get_default_interpreter() +Translator_group::where_defined (SCM sym) const { - if (accepts_str_arr_.size()) + if (properties_dict ()->elem_b (sym)) { - 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 (Translator_group*)this; } - return this; + + return (daddy_trans_) ? daddy_trans_->where_defined (sym) : 0; +} + +/* + return SCM_EOL when not found. +*/ +SCM +Translator_group::internal_get_property (SCM sym) const +{ + SCM val =SCM_EOL; + if (properties_dict ()->try_retrieve (sym, &val)) + return val; + + if (daddy_trans_) + return daddy_trans_->internal_get_property (sym); + + return val; } void -Translator_group::each (Method_pointer method) +Translator_group::internal_set_property (SCM sym, SCM val) { - for (PCursor i (trans_p_list_.top ()); i.ok (); i++) - (i.ptr()->*method) (); +#ifndef NDEBUG + if (internal_type_checking_global_b) + assert (type_check_assignment (sym, val, ly_symbol2scm ("translation-type?"))); +#endif + + properties_dict ()->set (sym, val); } +/* + TODO: look up to check whether we have inherited var? + */ void -Translator_group::each (Const_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) + if (gh_symbol_p (prop)) { - 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 (id_str_.length_i ()) - DOUT << "ID: " << id_str_ ; - DOUT << " iterators: " << iterator_count_<< "\n"; + if (val != SCM_UNDEFINED) + { + SCM prev = internal_get_property (prop); + + if (gh_pair_p (prev) || prev == SCM_EOL) + { + bool ok = type_check_assignment (eltprop, val, ly_symbol2scm ("backend-type?")); + + if (ok) + { + prev = gh_cons (gh_cons (eltprop, val), prev); + internal_set_property (prop, prev); + } + } + else + { + // warning here. + } + + } + else + { + SCM prev = internal_get_property (prop); + + SCM newprops= SCM_EOL ; + while (gh_pair_p (prev) && ly_caar (prev) != eltprop) + { + newprops = gh_cons (ly_car (prev), newprops); + prev = ly_cdr (prev); + } + + if (gh_pair_p (prev)) + { + newprops = scm_reverse_x (newprops, ly_cdr (prev)); + internal_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::do_announces); } void -Translator_group::do_creation_processing () +Translator_group::initialize () { - each (&Translator::creation_processing); + SCM tab = scm_make_vector (gh_int2scm (19), SCM_BOOL_F); + set_property ("acceptHashTable", tab); + each (&Translator::initialize); } void -Translator_group::do_removal_processing () +Translator_group::finalize () { each (&Translator::removal_processing); } -void -Translator_group::do_add_processing () + + +bool translator_accepts_any_of (Translator*tr, SCM ifaces) +{ + SCM ack_ifs = scm_assoc (ly_symbol2scm ("events-accepted"), + tr->translator_description()); + ack_ifs = gh_cdr (ack_ifs); + for (SCM s = ifaces; ly_pair_p (s); s = ly_cdr (s)) + if (scm_memq (ly_car (s), ack_ifs) != SCM_BOOL_F) + return true; + return false; +} + +SCM +find_accept_translators (SCM gravlist, SCM ifaces) { - for (int i=0; i < consists_str_arr_.size(); i++) + SCM l = SCM_EOL; + for (SCM s = gravlist; ly_pair_p (s); s = ly_cdr (s)) { - 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 ()); + Translator* tr = unsmob_translator (ly_car (s)); + if (translator_accepts_any_of (tr, ifaces)) + l = scm_cons (tr->self_scm (), l); } + l = scm_reverse_x (l, SCM_EOL); + + return l; } + +bool +Translator_group::try_music_on_nongroup_children (Music *m ) +{ + SCM tab = get_property ("acceptHashTable"); + SCM name = scm_sloppy_assq (ly_symbol2scm ("name"), + m->get_property_alist (false)); + + if (!gh_pair_p (name)) + return false; + + name = gh_cdr (name); + SCM accept_list = scm_hashq_ref (tab, name, SCM_UNDEFINED); + if (accept_list == SCM_BOOL_F) + { + accept_list = find_accept_translators (simple_trans_list_, + m->get_mus_property ("types")); + scm_hashq_set_x (tab, name, accept_list); + } + + for (SCM p = accept_list; gh_pair_p (p); p = ly_cdr (p)) + { + Translator * t = unsmob_translator (ly_car (p)); + if (t && t->try_music (m)) + return true; + } + return false; +} + +SCM +Translator_group::properties_as_alist () const +{ + return properties_dict()->to_alist(); +} +