X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Ftranslator-group.cc;h=6b735ad953232e7c317320ae2bd279c9013c6855;hb=8ecd09ad7514d57630fb611d38c161f3c3c708db;hp=e20daeb0aa3ca328ae8897a86bb9ee0ae8fa75f3;hpb=82731e802565546441c401a84a13b486e54eb760;p=lilypond.git diff --git a/lily/translator-group.cc b/lily/translator-group.cc index e20daeb0aa..6b735ad953 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--1999 Han-Wen Nienhuys + (c) 1997--2000 Han-Wen Nienhuys */ #include "music-output-def.hh" @@ -11,113 +11,81 @@ #include "translator.hh" #include "debug.hh" #include "moment.hh" -#include "dictionary-iter.hh" - +#include "scm-hash.hh" #include "killing-cons.tcc" +#include "translator-def.hh" Translator_group::Translator_group (Translator_group const&s) : Translator(s) { - consists_str_arr_ = s.consists_str_arr_; - consists_end_str_arr_ = s.consists_end_str_arr_; - accepts_str_arr_ = s.accepts_str_arr_; iterator_count_ =0; - properties_dict_ = s.properties_dict_; + + 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()); - trans_p_list_.junk (); + + //assert (removable_b()); } 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() { - Link_array groups (group_l_arr ()); - - for (int i =0; i < groups.size(); i++) + SCM next = SCM_EOL; + for (SCM p = trans_group_list_; gh_pair_p (p); p = next) { - groups[i]->check_removal(); - if (groups[i]->removable_b()) - terminate_translator (groups[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); } } -void -Translator_group::add_translator (Translator *trans_p) -{ - trans_p_list_.append (new Killing_cons (trans_p,0)); - - trans_p->daddy_trans_l_ = this; - trans_p->output_def_l_ = output_def_l_; - trans_p->add_processing (); -} -void -Translator_group::set_acceptor (String accepts, bool add) +SCM +Translator_group::add_translator (SCM list, Translator *t) { - if (add) - accepts_str_arr_.push (accepts); - else - for (int i=accepts_str_arr_.size (); i--; ) - if (accepts_str_arr_[i] == accepts) - accepts_str_arr_.del (i); -} + 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 (); + return list; +} void -Translator_group::add_last_element (String s) +Translator_group::add_group_translator (Translator *t) { - if (!get_translator_l (s)) - error (_ ("Program has no such type")); - - for (int i=consists_end_str_arr_.size (); i--; ) - if (consists_end_str_arr_[i] == s) - warning (_f ("Already contains: `%s'", s)); - - consists_end_str_arr_.push (s); + trans_group_list_ = add_translator (trans_group_list_,t); } -void -Translator_group::set_element (String s, bool add) -{ - if (!get_translator_l (s)) - error (_ ("Program has no such type")); - if (add) - { - for (int i=consists_str_arr_.size (); i--; ) - if (consists_str_arr_[i] == s) - warning (_f("Already contains: `%s'", s)); - - consists_str_arr_.push (s); - } - else - { - for (int i=consists_str_arr_.size (); i--; ) - if (consists_str_arr_[i] == s) - consists_str_arr_.del (i); - for (int i=consists_end_str_arr_.size (); i--; ) - if (consists_end_str_arr_[i] == s) - consists_end_str_arr_.del (i); - } -} + bool Translator_group::removable_b() const { - for (Cons *p = trans_p_list_.head_; p; p = p->next_) - { - if (dynamic_cast (p->car_)) - return false; - } - - return !iterator_count_; + return trans_group_list_ == SCM_EOL && ! iterator_count_; } Translator_group * @@ -126,54 +94,19 @@ Translator_group::find_existing_translator_l (String n, String id) if (is_alias_b (n) && (id_str_ == id || id.empty_b ())) return this; - Link_array groups (group_l_arr ()); Translator_group* r = 0; - for (int i =0; !r && i < groups.size(); i++) + for (SCM p = trans_group_list_; !r && gh_pair_p (p); p = gh_cdr (p)) { - r = groups[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 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 || !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); - 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) @@ -182,7 +115,8 @@ Translator_group::find_create_translator_l (String n, String 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 ()) { @@ -191,8 +125,9 @@ 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 ()); - current->add_translator (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; @@ -204,7 +139,7 @@ Translator_group::find_create_translator_l (String n, String id) ret = daddy_trans_l_->find_create_translator_l (n,id); else { - warning (_f ("Can't find or create `%s' called `%s'", n, id)); + warning (_f ("can't find or create `%s' called `%s'", n, id)); ret =0; } return ret; @@ -215,10 +150,11 @@ Translator_group::try_music_on_nongroup_children (Music *m) { bool hebbes_b =false; - Link_array nongroups (nongroup_l_arr ()); - for (int i =0; !hebbes_b && i < nongroups.size() ; i++) - hebbes_b =nongroups[i]->try_music (m); + 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; } @@ -247,41 +183,14 @@ Translator_group::ancestor_l (int level) return daddy_trans_l_->ancestor_l (level-1); } -Link_array -Translator_group::group_l_arr () const -{ - Link_array groups; - for (Cons *p = trans_p_list_.head_; p; p = p->next_) - { - if (dynamic_cast (p->car_)) - groups.push (dynamic_cast (p->car_)); - } - return groups; -} - -Link_array -Translator_group::nongroup_l_arr () const -{ - Link_array groups; - for (Cons *p = trans_p_list_.head_; p; p = p->next_) - { - if (!dynamic_cast (p->car_)) - groups.push (p->car_); - } - return groups; -} -/** - End translator: call "destructor", remove from hierarchy, and delete - */ - void Translator_group::terminate_translator (Translator*r_l) { - DEBUG_OUT << "Removing " << classname (r_l) << " at " << now_mom () << '\n'; r_l->removal_processing(); - Translator * trans_p =remove_translator_p (r_l); - - delete trans_p; + /* + Return value ignored. GC does the rest. + */ + remove_translator_p (r_l); } @@ -292,182 +201,247 @@ Translator * Translator_group::remove_translator_p (Translator*trans_l) { assert (trans_l); - - for (Cons **pp = &trans_p_list_.head_; *pp; pp = &(*pp)->next_) - if ((*pp)->car_ == trans_l) - { - Cons *r = trans_p_list_.remove_cons (pp); - r->car_ =0; - trans_l->daddy_trans_l_ =0; - delete r; - return trans_l; - } - return 0; + trans_group_list_ = scm_delq_x (trans_l->self_scm (), trans_group_list_); + trans_l->daddy_trans_l_ = 0; + return trans_l; } - +#if 0 +/* + should not use, instead: use properties to communicate between engravers. + */ Translator* Translator_group::get_simple_translator (String type) const { - Link_array nongroups (nongroup_l_arr ()); - for (int i=0; i < nongroups.size(); i++) + for (SCM p = simple_trans_list_; gh_pair_p (p); p =gh_cdr (p)) { - if (classname (nongroups[i]) == type) - return nongroups[i]; + 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_str_arr_.size (); -} - + return !gh_string_p (unsmob_translator_def (definition_)->default_child_context_name ()); +} Translator_group* Translator_group::get_default_interpreter() { - if (accepts_str_arr_.size()) + if (!is_bottom_translator_b ()) { - Translator*t = output_def_l ()->find_translator_l (accepts_str_arr_[0]); + 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'", accepts_str_arr_[0])); - 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_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; } -void -Translator_group::each (Method_pointer method) +static void +static_each (SCM list, Method_pointer method) { - for (Cons *p = trans_p_list_.head_; p; p = p->next_) - (p->car_->*method) (); + for (SCM p = list; gh_pair_p (p); p = gh_cdr(p)) + (unsmob_translator (gh_car (p))->*method) (); + } - void -Translator_group::each (Const_method_pointer method) const +Translator_group::each (Method_pointer method) { - for (Cons *p = trans_p_list_.head_; p; p = p->next_) - (p->car_->*method) (); + static_each (simple_trans_list_, method); + static_each (trans_group_list_, method); } + + void -Translator_group::do_print() const +Translator_group::do_add_processing () { -#ifndef NPRINT - if (!flower_dstream) - return ; - - gh_display (properties_dict_.self_scm_); - if (status == ORPHAN) + unsmob_translator_def (definition_)->apply_property_operations (this); + for (SCM s = simple_trans_list_; gh_pair_p (s) ; s = gh_cdr (s)) { - DEBUG_OUT << "consists of: "; - for (int i=0; i < consists_str_arr_.size (); i++) - DEBUG_OUT << consists_str_arr_[i] << ", "; - DEBUG_OUT << "\naccepts: "; - for (int i=0; i < accepts_str_arr_.size (); i++) - DEBUG_OUT << accepts_str_arr_[i] << ", "; + Translator * t = unsmob_translator (gh_car (s)); + t->add_processing (); } - else +} + +/* + PROPERTIES + */ +Translator_group* +Translator_group::where_defined (SCM sym) const +{ + if (properties_dict ()->elem_b (sym)) { - if (id_str_.length_i ()) - DEBUG_OUT << "ID: " << id_str_ ; - DEBUG_OUT << " iterators: " << iterator_count_<< '\n'; + return (Translator_group*)this; } - each (&Translator::print); -#endif + + return (daddy_trans_l_) ? daddy_trans_l_->where_defined (sym) : 0; } -void -Translator_group::do_pre_move_processing () +SCM +Translator_group::get_property (SCM sym) const { - each (&Translator::pre_move_processing); + SCM val =SCM_UNDEFINED; + 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::do_post_move_processing () +Translator_group::set_property (String id, SCM val) { - each (&Translator::post_move_processing); + set_property (ly_symbol2scm (id.ch_C()), val); } void -Translator_group::do_process_requests () +Translator_group::set_property (SCM sym, SCM val) { - each (&Translator::process_requests); + properties_dict ()->set (sym, val); } +/* + 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_creation_processing () +Translator_group::execute_single_pushpop_property (SCM prop, SCM eltprop, SCM val) { - each (&Translator::creation_processing); + 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 = true; + + SCM errport = scm_current_error_port (); + + SCM meta = scm_assoc (ly_symbol2scm ("meta"), prev); + SCM props = scm_assoc (ly_symbol2scm ("properties"), gh_cdr (meta)); + SCM propdesc = scm_assoc (eltprop, gh_cdr (props)); + if (!gh_pair_p (propdesc)) + { + scm_puts (_("Couldn't find property description for #'").ch_C(),errport); + scm_display (eltprop, errport); + + scm_puts (_(" in element description ").ch_C(),errport); + scm_display (prop, errport); + + scm_puts (_(". Perhaps you made a typing error?\n").ch_C(),errport); + } + else + { + + SCM predicate = gh_cadr (propdesc); + if (gh_call1 (predicate, val) == SCM_BOOL_F) + { + ok = false; + scm_puts (_("Failed typecheck for #'").ch_C (),errport); + scm_display (eltprop,errport); + scm_puts ( _(", value ").ch_C (), errport); + scm_display (val, errport); + scm_puts (_(" must satisfy ").ch_C (), errport); + scm_display (predicate, errport); + scm_puts ("\n", errport); + } + } + + 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); + } + } + } } + + + + +/* + STUBS +*/ void -Translator_group::do_removal_processing () +Translator_group::do_pre_move_processing () { - each (&Translator::removal_processing); + each (&Translator::pre_move_processing); } void -Translator_group::do_add_processing () +Translator_group::do_post_move_processing () { - for (int i=0; i < consists_str_arr_.size(); i++) - { - String s = consists_str_arr_[i]; - Translator * t = output_def_l ()->find_translator_l (s); - if (!t) - warning (_f ("Can't find: `%s'", s)); - else - add_translator (t->clone ()); - } - for (int i=0; i-- < consists_end_str_arr_.size (); i++) - { - String s = consists_end_str_arr_[i]; - Translator * t = output_def_l ()->find_translator_l (s); - if (!t) - warning (_f ("Can't find: `%s'", s)); - else - add_translator (t->clone ()); - } + each (&Translator::post_move_processing); } -SCM -Translator_group::get_property (SCM sym, Translator_group **where_l) const +void +Translator_group::do_process_music () { - if (properties_dict_.elem_b (sym)) - { - if (where_l) - *where_l = (Translator_group*) this; // ugh - return properties_dict_[sym]; - } - - if (daddy_trans_l_) - return daddy_trans_l_->get_property (sym, where_l); - - if (where_l) - *where_l = 0; + each (&Translator::process_music); +} - return SCM_UNDEFINED; +void +Translator_group::do_creation_processing () +{ + each (&Translator::creation_processing); } void -Translator_group::set_property (String id, SCM val) +Translator_group::do_removal_processing () { - properties_dict_[ly_symbol2scm (id.ch_C())] = val; + each (&Translator::removal_processing); }