X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftranslator-group.cc;h=83bfdfa0b7be9eeb0839a056a0a20b8103c6eea9;hb=a888266d57ec3f34d5ba2c31bcb6af094138f49d;hp=cc09ca0668a6ccaeca7031a7a4628ffbd620d944;hpb=f085824b2182c1f0fa2c5118884770ac7ff775c7;p=lilypond.git

diff --git a/lily/translator-group.cc b/lily/translator-group.cc
index cc09ca0668..83bfdfa0b7 100644
--- a/lily/translator-group.cc
+++ b/lily/translator-group.cc
@@ -1,295 +1,325 @@
 /*
-  Translator_group.cc -- implement Translator_group
+  translator-group.cc -- implement Translator_group
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>,
+                 Erik Sandberg <mandolaerik@gmail.com>
 */
 
-#include "music-output-def.hh"
 #include "translator-group.hh"
-#include "translator.hh"
-#include "warn.hh"
-#include "moment.hh"
-#include "scm-hash.hh"
+
 #include "context-def.hh"
+#include "context.hh"
+#include "dispatcher.hh"
+#include "engraver-group.hh"
+#include "international.hh"
 #include "main.hh"
 #include "music.hh"
+#include "output-def.hh"
+#include "performer-group.hh"
+#include "scm-hash.hh"
+#include "warn.hh"
+
 
-Translator_group::Translator_group (Translator_group const&s)
-  : Translator (s)
+void
+translator_each (SCM list, Translator_method method)
 {
-  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 ());
+  for (SCM p = list; scm_is_pair (p); p = scm_cdr (p))
+    (unsmob_translator (scm_car (p))->*method) ();
 }
 
-Scheme_hash_table*
-Translator_group::properties_dict () const
+void
+Translator_group::initialize ()
 {
-  return Scheme_hash_table::unsmob (properties_scm_);
+  precompute_method_bindings ();
 }
 
-Translator_group::~Translator_group ()
+void
+Translator_group::connect_to_context (Context *c)
 {
+  if (context_)
+    {
+      programming_error ("translator group is already connected to context "
+			 +  context_->context_name ());
+    }
   
-  //assert (is_removable ());
+  context_ = c;
+  c->event_source ()->add_listener (GET_LISTENER (create_child_translator),
+				    ly_symbol2scm ("AnnounceNewContext"));
+  for (SCM tr_list = simple_trans_list_; scm_is_pair (tr_list); tr_list = scm_cdr (tr_list))
+    {
+      Translator *tr = unsmob_translator (scm_car (tr_list));
+      tr->connect_to_context (c);
+    }
 }
 
-
-Translator_group::Translator_group ()
+void
+Translator_group::disconnect_from_context ()
 {
-  iterator_count_  = 0;
-  Scheme_hash_table *tab = new Scheme_hash_table ;
-  properties_scm_ = tab->self_scm ();
-
-  scm_gc_unprotect_object (tab->self_scm ());
+  for (SCM tr_list = simple_trans_list_; scm_is_pair (tr_list); tr_list = scm_cdr (tr_list))
+    {
+      Translator *tr = unsmob_translator (scm_car (tr_list));
+      tr->disconnect_from_context (context_);
+    }
+  context_->event_source ()->remove_listener (GET_LISTENER (create_child_translator),
+					      ly_symbol2scm ("AnnounceNewContext"));
+  context_ = 0;
+  protected_events_ = SCM_EOL;
 }
 
 void
-Translator_group::check_removal ()
+Translator_group::finalize ()
 {
-  SCM next = SCM_EOL; 
-  for (SCM p = trans_group_list_; gh_pair_p (p); p = next)
-    {
-      next = ly_cdr (p);
-
-      Translator_group *trg =  dynamic_cast<Translator_group*> (unsmob_translator (ly_car (p)));
+}
 
-      trg->check_removal ();
-      if (trg->is_removable ())
-	terminate_translator (trg);
+SCM
+filter_performers (SCM ell)
+{
+  SCM *tail = &ell;
+  for (SCM p = ell; scm_is_pair (p); p = scm_cdr (p))
+    {
+      if (dynamic_cast<Performer *> (unsmob_translator (scm_car (*tail))))
+	*tail = scm_cdr (*tail);
+      else
+	tail = SCM_CDRLOC (*tail);
     }
+  return ell;
 }
 
 SCM
-Translator_group::add_translator (SCM list, Translator *t)
+filter_engravers (SCM ell)
 {
-  /*
-    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;
+  SCM *tail = &ell;
+  for (SCM p = ell; scm_is_pair (p); p = scm_cdr (p))
+    {
+      if (dynamic_cast<Engraver *> (unsmob_translator (scm_car (*tail))))
+	*tail = scm_cdr (*tail);
+      else
+	tail = SCM_CDRLOC (*tail);
+    }
+  return ell;
 }
 
-
+/* 
+  Protects the parameter from being garbage collected. The object is
+  protected until the next disconnect_from_context call.
+
+  Whenever a child translator hears an event, the event is added to
+  this list. This eliminates the need for derived_mark methods in most
+  translators; all incoming events are instead protected by the
+  translator group.
+ 
+  TODO: Should the list also be flushed at the beginning of each new
+  moment?
+ */
 void
-Translator_group::add_used_group_translator (Translator *t)
+Translator_group::protect_event (SCM ev)
 {
-  trans_group_list_ = add_translator (trans_group_list_,t);
+  protected_events_ = scm_cons (ev, protected_events_);
 }
 
-
+/*
+  Create a new translator for a newly created child context. Triggered
+  by AnnounceNewContext events.
+ */
+IMPLEMENT_LISTENER (Translator_group, create_child_translator);
 void
-Translator_group::add_fresh_group_translator (Translator*t)
+Translator_group::create_child_translator (SCM sev)
 {
-  Translator_group*tg = dynamic_cast<Translator_group*> (t);
-  trans_group_list_ = add_translator (trans_group_list_,t);
-  scm_gc_unprotect_object (t->self_scm ());
+  Stream_event *ev = unsmob_stream_event (sev);
+  // get from AnnounceNewContext
+  SCM cs = ev->get_property ("context");
+  Context *new_context = unsmob_context (cs);
+  Context_def *def = unsmob_context_def (new_context->get_definition ());
+  SCM ops = new_context->get_definition_mods ();
+  
+  SCM trans_names = def->get_translator_names (ops);
 
-  Context_def * td = unsmob_context_def (tg->definition_);
+  Translator_group *g = get_translator_group (def->get_translator_group_type ());
+  SCM trans_list = SCM_EOL;
 
-  /*
-    this can not move before add_translator(), because \override
-    operations require that we are in the hierarchy.
-   */
-  td->apply_default_property_operations (tg);
+  for (SCM s = trans_names; scm_is_pair (s); s = scm_cdr (s))
+    {
+      Translator *type = get_translator (scm_car (s));
+      if (!type)
+	warning (_f ("cannot find: `%s'", ly_symbol2string (scm_car (s)).c_str ()));
+      else
+	{
+	  Translator *tr = type->clone ();
+	  SCM str = tr->self_scm ();
 
-  t->initialize ();
-}
+	  if (tr->must_be_last ())
+	    {
+	      SCM cons = scm_cons (str, SCM_EOL);
+	      if (scm_is_pair (trans_list))
+		scm_set_cdr_x (scm_last_pair (trans_list), cons);
+	      else
+		trans_list = cons;
+	    }
+	  else
+	    trans_list = scm_cons (str, trans_list);
+
+	  tr->daddy_context_ = new_context;
+	  tr->unprotect ();
+	}
+    }
 
-bool
-Translator_group::try_music (Music* m)
-{
-  bool hebbes_b = try_music_on_nongroup_children (m);
-  
-  if (!hebbes_b && daddy_trans_)
-    hebbes_b = daddy_trans_->try_music (m);
-  
-  return hebbes_b ;
+  /* Filter unwanted translator types. Required to make
+     \with {\consists "..."} work. */
+  if (dynamic_cast<Engraver_group *> (g))
+    g->simple_trans_list_ = filter_performers (trans_list);
+  else if (dynamic_cast<Performer_group *> (g))
+    g->simple_trans_list_ = filter_engravers (trans_list);
+
+  // TODO: scrap Context::implementation
+  new_context->implementation_ = g;
+
+  g->connect_to_context (new_context);
+  g->unprotect ();
+
+  recurse_over_translators (new_context,
+			    &Translator::initialize,
+			    &Translator_group::initialize,
+			    DOWN);
 }
 
-void
-Translator_group::terminate_translator (Translator*r)
+SCM
+Translator_group::get_simple_trans_list ()
 {
-  r->finalize ();
-  /*
-    Return value ignored. GC does the rest.
-   */
-  remove_translator (r);
+  return simple_trans_list_;
 }
 
-
-/**
-   Remove a translator from the hierarchy.
- */
-Translator *
-Translator_group::remove_translator (Translator*trans)
+void
+precomputed_recurse_over_translators (Context *c, Translator_precompute_index idx, Direction dir)
 {
-  assert (trans);
+  Translator_group *tg
+    = dynamic_cast<Translator_group *> (c->implementation ());
 
-  trans_group_list_ = scm_delq_x (trans->self_scm (), trans_group_list_);
-  trans->daddy_trans_ = 0;
-  return trans;
-}
+  if (tg && dir == DOWN)
+    {
+      tg->precomputed_translator_foreach (idx);
+      tg->call_precomputed_self_method (idx);
+    }
 
+  for (SCM s = c->children_contexts (); scm_is_pair (s);
+       s = scm_cdr (s))
+    precomputed_recurse_over_translators (unsmob_context (scm_car (s)), idx, dir);
 
-static void
-static_each (SCM list, Method_pointer method)
-{
-  for (SCM p = list; gh_pair_p (p); p = ly_cdr (p))
-    (unsmob_translator (ly_car (p))->*method) ();
-  
+  if (tg && dir == UP)
+    {
+      tg->precomputed_translator_foreach (idx);
+      tg->call_precomputed_self_method (idx);
+    }
 }
 
 void
-Translator_group::each (Method_pointer method) 
+recurse_over_translators (Context *c, Translator_method ptr, Translator_group_method tg_ptr, Direction dir)
 {
-  static_each (get_simple_trans_list (), method);
-  static_each (trans_group_list_, method);
-}
+  Translator_group *tg
+    = dynamic_cast<Translator_group *> (c->implementation ());
 
+  if (tg && dir == DOWN)
+    {
+      (tg->*tg_ptr) ();
+      translator_each (tg->get_simple_trans_list (), ptr);
+    }
 
+  for (SCM s = c->children_contexts (); scm_is_pair (s);
+       s = scm_cdr (s))
+    recurse_over_translators (unsmob_context (scm_car (s)), ptr, tg_ptr, dir);
 
+  if (tg && dir == UP)
+    {
+      translator_each (tg->get_simple_trans_list (),
+		       ptr);
 
-/*
-  STUBS
-*/
-void
-Translator_group::stop_translation_timestep ()
-{
-  each (&Translator::stop_translation_timestep);
+      (tg->*tg_ptr) ();
+    }
 }
 
-void
-Translator_group::start_translation_timestep ()
+Translator_group::Translator_group ()
 {
-  each (&Translator::start_translation_timestep);
+  simple_trans_list_ = SCM_EOL;
+  protected_events_ = SCM_EOL;
+  context_ = 0;
+  smobify_self ();
 }
 
 void
-Translator_group::do_announces ()
+Translator_group::derived_mark () const
 {
-  each (&Translator::do_announces);
 }
 
 void
-Translator_group::initialize ()
+Translator_group::precompute_method_bindings ()
 {
-  SCM tab = scm_make_vector (gh_int2scm (19), SCM_BOOL_F);
-  set_property ("acceptHashTable", tab);
-  each (&Translator::initialize);
-}
+  for (SCM s = simple_trans_list_; scm_is_pair (s); s = scm_cdr (s))
+    {
+      Translator *tr = unsmob_translator (scm_car (s));
+      Translator_void_method_ptr ptrs[TRANSLATOR_METHOD_PRECOMPUTE_COUNT];
+      tr->fetch_precomputable_methods (ptrs);
 
-void
-Translator_group::finalize ()
-{
-  each (&Translator::finalize);
-}
+      assert (tr);
+      for (int i = 0; i < TRANSLATOR_METHOD_PRECOMPUTE_COUNT; i++)
+	{
+	  if (ptrs[i])
+	    precomputed_method_bindings_[i].push_back (Translator_method_binding (tr, ptrs[i]));
+	}
+    }
 
-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;
+  fetch_precomputable_methods (precomputed_self_method_bindings_);
 }
 
-SCM
-find_accept_translators (SCM gravlist, SCM ifaces)
+void
+Translator_group::precomputed_translator_foreach (Translator_precompute_index idx)
 {
-  SCM l = SCM_EOL;
-  for (SCM s = gravlist; ly_pair_p (s);  s = ly_cdr (s))
-    {
-      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;
+  vector<Translator_method_binding> &bindings (precomputed_method_bindings_[idx]);
+  for (vsize i = 0; i < bindings.size (); i++)
+    bindings[i].invoke ();
 }
 
-bool
-Translator_group::try_music_on_nongroup_children (Music *m )
+void
+Translator_group::fetch_precomputable_methods (Translator_group_void_method ptrs[])
 {
-  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 (get_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;
+  for (int i = 0; i < TRANSLATOR_METHOD_PRECOMPUTE_COUNT; i++)
+    ptrs[i] = 0;
 }
 
-SCM
-Translator_group::properties_as_alist () const
+void
+Translator_group::call_precomputed_self_method (Translator_precompute_index idx)
 {
-  return properties_dict()->to_alist();
+  if (precomputed_self_method_bindings_[idx])
+    (*precomputed_self_method_bindings_[idx]) (this);
 }
 
-String
-Translator_group::context_name () const
+Translator_group::~Translator_group ()
 {
-  Context_def * td = unsmob_context_def (definition_ );
-  return ly_symbol2string (td->get_context_name ());
 }
 
+#include "ly-smobs.icc"
 
+IMPLEMENT_SMOBS (Translator_group);
+IMPLEMENT_DEFAULT_EQUAL_P (Translator_group);
+IMPLEMENT_TYPE_P (Translator_group, "ly:translator-group?");
 
-SCM
-names_to_translators (SCM namelist, Translator_group*tg)
+int
+Translator_group::print_smob (SCM s, SCM port, scm_print_state *)
 {
-  SCM l = SCM_EOL;
-  for (SCM s = namelist; gh_pair_p (s) ; s = ly_cdr (s))
-    {
-      Translator * t = get_translator (ly_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);
-
-	  tr->daddy_trans_ = tg;
-	  tr->output_def_  = tg->output_def_;
-
-	  scm_gc_unprotect_object (str);
-	}
-    }
-  return l;
+  Translator_group *me = (Translator_group *) SCM_CELL_WORD_1 (s);
+  scm_puts ("#<Translator_group ", port);
+  scm_puts (me->class_name (), port);
+  scm_display (me->simple_trans_list_, port);
+  scm_puts (" >", port);
+  return 1;
 }
 
-
 SCM
-Translator_group::get_simple_trans_list ()
+Translator_group::mark_smob (SCM smob)
 {
-  return simple_trans_list_;
-}
+  Translator_group *me = (Translator_group *)SCM_CELL_WORD_1 (smob);
 
+  me->derived_mark ();
+  scm_gc_mark (me->protected_events_);
+  return me->simple_trans_list_;
+}