source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "music-output-def.hh"
#include "translator-group.hh"
#include "translator.hh"
-#include "debug.hh"
+#include "warn.hh"
#include "moment.hh"
#include "scm-hash.hh"
-#include "killing-cons.tcc"
#include "translator-def.hh"
+#include "main.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_gc_unprotect_object (tab->self_scm ());
}
Scheme_hash_table*
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 ());
+ scm_gc_unprotect_object (tab->self_scm ());
}
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)
{
- next = gh_cdr (p);
+ next = ly_cdr (p);
- Translator_group *trg = dynamic_cast<Translator_group*> (unsmob_translator (gh_car (p)));
+ Translator_group *trg = dynamic_cast<Translator_group*> (unsmob_translator (ly_car (p)));
trg->check_removal ();
- if (trg->removable_b())
+ 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_l_ = this;
- t->output_def_l_ = output_def_l_;
- t->add_processing ();
- t->do_creation_processing ();
+ t->daddy_trans_ = this;
+ t->output_def_ = output_def_;
+
return list;
}
+
+
void
-Translator_group::add_group_translator (Translator *t)
+Translator_group::add_used_group_translator (Translator *t)
{
trans_group_list_ = add_translator (trans_group_list_,t);
}
+void
+Translator_group::add_fresh_group_translator (Translator*t)
+{
+ Translator_group*tg = dynamic_cast<Translator_group*> (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 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 ()))
return this;
Translator_group* r = 0;
- for (SCM p = trans_group_list_; !r && gh_pair_p (p); p = gh_cdr (p))
+ for (SCM p = trans_group_list_; !r && gh_pair_p (p); p = ly_cdr (p))
{
- Translator * t = unsmob_translator (gh_car (p));
+ Translator * t = unsmob_translator (ly_car (p));
- r = dynamic_cast<Translator_group*> (t)->find_existing_translator_l (n, id);
+ r = dynamic_cast<Translator_group*> (t)->find_existing_translator (n, id);
}
return r;
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<Translator_def> 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.to_str0 ()), get_output_def ());
if (path.size ())
{
// 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]->instantiate (output_def_l_);
+ Translator_group * new_group = path[i]->instantiate (output_def_);
- current->add_group_translator (new_group);
+ 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 (_f ("can't find or create `%s' called `%s'", n, id));
{
bool hebbes_b =false;
- for (SCM p = simple_trans_list_; !hebbes_b && gh_pair_p (p); p = gh_cdr (p))
+ for (SCM p = simple_trans_list_; !hebbes_b && gh_pair_p (p); p = ly_cdr (p))
{
- hebbes_b = unsmob_translator (gh_car (p))->try_music (m);
+ hebbes_b = unsmob_translator (ly_car (p))->try_music (m);
}
return hebbes_b;
}
{
bool hebbes_b = try_music_on_nongroup_children (m);
- if (!hebbes_b && daddy_trans_l_)
- hebbes_b = daddy_trans_l_->try_music (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);
}
void
-Translator_group::terminate_translator (Translator*r_l)
+Translator_group::terminate_translator (Translator*r)
{
- r_l->removal_processing();
+ r->removal_processing ();
/*
Return value ignored. GC does the rest.
*/
- remove_translator_p (r_l);
+ remove_translator (r);
}
Remove a translator from the hierarchy.
*/
Translator *
-Translator_group::remove_translator_p (Translator*trans_l)
+Translator_group::remove_translator (Translator*trans)
{
- assert (trans_l);
+ assert (trans);
- trans_group_list_ = scm_delq_x (trans_l->self_scm (), trans_group_list_);
- trans_l->daddy_trans_l_ = 0;
- return trans_l;
+ trans_group_list_ = scm_delq_x (trans->self_scm (), trans_group_list_);
+ trans->daddy_trans_ = 0;
+ return trans;
}
bool
}
Translator_group*
-Translator_group::get_default_interpreter()
+Translator_group::get_default_interpreter ()
{
if (!is_bottom_translator_b ())
{
SCM nm = unsmob_translator_def (definition_)->default_child_context_name ();
- SCM st = output_def_l ()->find_translator_l (nm);
+ 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).ch_C()));
+ 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_l_);
- add_group_translator (tg);
+ Translator_group *tg = t->instantiate (output_def_);
+ add_fresh_group_translator (tg);
if (!tg->is_bottom_translator_b ())
return tg->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 = ly_cdr (p))
+ (unsmob_translator (ly_car (p))->*method) ();
}
}
-
-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
*/
return (Translator_group*)this;
}
- return (daddy_trans_l_) ? daddy_trans_l_->where_defined (sym) : 0;
+ return (daddy_trans_) ? daddy_trans_->where_defined (sym) : 0;
}
/*
return SCM_EOL when not found.
*/
SCM
-Translator_group::get_property (SCM sym) const
+Translator_group::internal_get_property (SCM sym) const
{
SCM val =SCM_EOL;
if (properties_dict ()->try_retrieve (sym, &val))
return val;
- if (daddy_trans_l_)
- return daddy_trans_l_->get_property (sym);
+ if (daddy_trans_)
+ return daddy_trans_->internal_get_property (sym);
return val;
}
void
-Translator_group::set_property (String id, SCM val)
+Translator_group::internal_set_property (SCM sym, SCM val)
{
- set_property (ly_symbol2scm (id.ch_C()), val);
+#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::set_property (SCM sym, SCM val)
+Translator_group::unset_property (SCM sym)
{
- properties_dict ()->set (sym, val);
+ 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::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);
+ SCM prev = internal_get_property (prop);
if (gh_pair_p (prev) || prev == SCM_EOL)
{
- bool ok = type_check_assignment (val, eltprop, ly_symbol2scm ("backend-type?"));
-
-
+ bool ok = type_check_assignment (eltprop, val, ly_symbol2scm ("backend-type?"));
if (ok)
{
prev = gh_cons (gh_cons (eltprop, val), prev);
- set_property (prop, prev);
+ internal_set_property (prop, prev);
}
}
else
}
else
{
- SCM prev = get_property (prop);
+ SCM prev = internal_get_property (prop);
SCM newprops= SCM_EOL ;
- while (gh_pair_p (prev) && gh_caar (prev) != eltprop)
+ while (gh_pair_p (prev) && ly_caar (prev) != eltprop)
{
- newprops = gh_cons (gh_car (prev), newprops);
- prev = gh_cdr (prev);
+ newprops = gh_cons (ly_car (prev), newprops);
+ prev = ly_cdr (prev);
}
if (gh_pair_p (prev))
{
- newprops = scm_reverse_x (newprops, gh_cdr (prev));
- set_property (prop, newprops);
+ newprops = scm_reverse_x (newprops, ly_cdr (prev));
+ internal_set_property (prop, newprops);
}
}
}
void
Translator_group::stop_translation_timestep ()
{
- each (&Translator::pre_move_processing);
+ each (&Translator::stop_translation_timestep);
}
void
Translator_group::start_translation_timestep ()
{
- each (&Translator::post_move_processing);
+ each (&Translator::start_translation_timestep);
}
void
Translator_group::do_announces ()
{
- each (&Translator::announces);
+ each (&Translator::do_announces);
}
void
-Translator_group::do_creation_processing ()
+Translator_group::initialize ()
{
- each (&Translator::do_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)
+LY_DEFINE(ly_get_context_property,
+ "ly-get-context-property", 2, 0, 0,
+ (SCM context, SCM name),
+ "retrieve the value of @var{sym} from context @var{tr}")
{
- bool ok = true;
- SCM type_p = SCM_EOL;
- SCM errport = scm_current_error_port ();
+ Translator *t = unsmob_translator (context);
+ Translator_group* tr= dynamic_cast<Translator_group*> (t);
+ SCM_ASSERT_TYPE(tr, context, SCM_ARG1, __FUNCTION__, "Translator group");
+ SCM_ASSERT_TYPE(gh_symbol_p (name), name, SCM_ARG2, __FUNCTION__, "symbol");
- if (SCM_IMP(sym))
- type_p = scm_object_property (sym, type_symbol);
+ return tr->internal_get_property (name);
+
+}
- if (type_p != SCM_EOL && !gh_procedure_p (type_p))
- {
- scm_puts (_("Couldn't find property type-check for `").ch_C(),errport);
- scm_puts (String ("'").ch_C(), errport);
- scm_display (sym, errport);
+LY_DEFINE(ly_set_context_property,
+ "ly-set-context-property", 3, 0, 0,
+ (SCM context, SCM name, SCM val),
+ "set value of property @var{sym} in context @var{tr} to @var{val}.
+")
+{
+ Translator *t = unsmob_translator (context);
+ Translator_group* tr= dynamic_cast<Translator_group*> (t);
- scm_puts (_(". Perhaps you made a typing error?\n").ch_C(),errport);
- }
- else
- {
- if (val != SCM_EOL
- && gh_procedure_p (type_p)
- && gh_call1 (type_p, val) == SCM_BOOL_F)
- {
- ok = false;
- scm_puts (_("Failed typecheck for `").ch_C (),errport);
- scm_display (sym,errport);
- scm_puts ( _("', value `").ch_C (), errport);
- scm_write (val, errport);
- scm_puts (_("' must be of type ").ch_C (), errport);
- SCM typefunc = scm_eval2 (ly_symbol2scm ("type-name"), SCM_EOL);
- scm_display (gh_call1 (typefunc, type_p), errport);
- scm_puts ("\n", errport);
- }
- }
- return ok;
+ SCM_ASSERT_TYPE(tr, context, SCM_ARG1, __FUNCTION__, "Context");
+ tr->internal_set_property (name, val);
+
+ return SCM_UNSPECIFIED;
}