release: 1.3.110

[lilypond.git] / lily / translator.cc

diff --git a/lily/translator.cc b/lily/translator.cc
index 6605eaae0ca1ae2ababd353a41ede4b9fa856f95..0345c2c370b08e705bfd007d94ea43a7188fc89a 100644 (file)
--- a/lily/translator.cc
+++ b/lily/translator.cc
@@ -27,14 +27,10 @@ Translator::~Translator ()
 void
 Translator::init ()
 {
-  status_ = ORPHAN;
   simple_trans_list_ = SCM_EOL;
   trans_group_list_ = SCM_EOL;
   properties_scm_ = SCM_EOL;
-  accepts_name_list_ = SCM_EOL;   
-  consists_name_list_ = SCM_EOL;
-  end_consists_name_list_ = SCM_EOL;
-  property_pushes_ = SCM_EOL;
+  definition_ = SCM_EOL;
   daddy_trans_l_ =0;
 }
 
@@ -50,12 +46,6 @@ Translator::Translator (Translator const &s)
   : Input (s)
 {
   init ();
-  
-  consists_name_list_ = scm_list_copy (s.consists_name_list_);
-  end_consists_name_list_ = scm_list_copy (s.end_consists_name_list_);
-  accepts_name_list_ = scm_list_copy (s.accepts_name_list_);
-  property_pushes_ = scm_list_copy (s.property_pushes_);
-  
   output_def_l_ = s.output_def_l_;
   type_str_ = s.type_str_;
 
@@ -69,7 +59,7 @@ Translator::is_alias_b (String s) const
 }
 
 bool
-Translator::do_try_music (Music *)
+Translator::try_music (Music *)
 {
   return false;
 }
@@ -82,100 +72,33 @@ Translator::now_mom () const
 }
 
 
-void
-Translator::add_processing ()
-{
-  if (status_ > ORPHAN)
-    return;
-  
-  do_add_processing ();
-  status_ = VIRGIN;
-}
 
-void
-Translator::do_add_processing ()
-{
-}
 
-void
-Translator::print () const
-{
-#ifndef NPRINT
-  DEBUG_OUT << classname (this) << " {";
-  if (classname (this) != type_str_)
-    DEBUG_OUT << "type = " << type_str_;
-  do_print ();
-  DEBUG_OUT << "}\n";
-#endif
-}
-
-void
-Translator::do_print () const
-{
-}
-
-
-
-
-void
-Translator::creation_processing ()
-{
-  if (status_ >= CREATION_INITED)
-    return ;
-  
-  do_creation_processing ();
-  status_ = CREATION_INITED;
-}
 
 void
 Translator::post_move_processing ()
 {
-  if (status_ >= MOVE_INITED)
-    return;
-
-  creation_processing ();
-  do_post_move_processing ();
-  status_ = MOVE_INITED;
+  start_translation_timestep ();
 }
 
 void
 Translator::removal_processing ()
 {
-  if (status_ == ORPHAN)
-    return;
-  creation_processing ();
-  do_removal_processing ();
-  // elegancy ...
-  // status_ = ORPHAN;
+  finalize ();
 }
 
 
-bool
-Translator::try_music (Music * r)
-{
-  if (status_ < MOVE_INITED)
-    post_move_processing ();
-
-  return do_try_music (r);
-}
-
 void
-Translator::process_music ()
+Translator::announces ()
 {
-  if (status_ < PROCESSED_REQS)
-    post_move_processing ();
-  else if (status_ >= PROCESSED_REQS)
-    return; 
-  
-  status_ = PROCESSED_REQS;
-  do_process_music ();
+  do_announces ();
 }
 
+
 void
 Translator::pre_move_processing ()
 {
-  do_pre_move_processing ();
-  status_ = CREATION_INITED;
+  stop_translation_timestep ();
 }
 
 
@@ -199,27 +122,27 @@ Translator::get_property (SCM sym) const
 }
 
 void
-Translator:: do_pre_move_processing ()
+Translator:: stop_translation_timestep ()
 {
 }
 
 void
-Translator::do_post_move_processing ()
+Translator::start_translation_timestep ()
 {
 }
 
 void
-Translator::do_process_music ()
+Translator::do_announces ()
 {
 }
 
 void
-Translator::do_creation_processing ()
+Translator::initialize ()
 {
 }
 
 void
-Translator::do_removal_processing ()
+Translator::finalize ()
 {
 }
 
@@ -233,12 +156,11 @@ SCM
 Translator::mark_smob (SCM sm)
 {
   Translator * me = (Translator*) SCM_CELL_WORD_1(sm);
-  scm_gc_mark (me->consists_name_list_);
-  scm_gc_mark (me->accepts_name_list_);
-  scm_gc_mark (me->end_consists_name_list_);
   scm_gc_mark (me->simple_trans_list_);
   scm_gc_mark (me->trans_group_list_);
-  scm_gc_mark (me->property_pushes_);
+  scm_gc_mark (me->definition_);  
+  scm_gc_mark (me->properties_scm_);  
+
   return me->properties_scm_;
 }