X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftranslator.cc;h=477d2a111b8d87af9308165fa470588d624df066;hb=8d0267eb80a7cb026751db0a9eabeb61d958776e;hp=68db603831d8396abbec3acb0d4955e63980b68c;hpb=eae90c59e6fc5a916c6736d2ca56486b045768a5;p=lilypond.git

diff --git a/lily/translator.cc b/lily/translator.cc
index 68db603831..477d2a111b 100644
--- a/lily/translator.cc
+++ b/lily/translator.cc
@@ -3,50 +3,65 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
 #include "translator.hh"
-#include "debug.hh"
+#include "warn.hh"
 #include "translator-group.hh"
+#include "translator-def.hh"
 
 #include "moment.hh"
+#include "ly-smobs.icc"
 
-char const*
-Translator::name() const
+
+Translator::~Translator ()
 {
-  return classname(this);
 }
 
-Translator::~Translator ()
+void
+Translator::init ()
 {
+  simple_trans_list_ = SCM_EOL;
+  trans_group_list_ = SCM_EOL;
+  properties_scm_ = SCM_EOL;
+  definition_ = SCM_EOL;
+  daddy_trans_ =0;
 }
 
 Translator::Translator ()
 {
-  status = ORPHAN;
-  daddy_trans_l_ = 0;
-  output_def_l_ = 0;
+  self_scm_ = SCM_EOL;
+  init ();
+  output_def_ = 0;
+  smobify_self ();
 }
 
 Translator::Translator (Translator const &s)
-  : Input (s)
 {
-  status = ORPHAN;
-  daddy_trans_l_ =0;
-  output_def_l_ = s.output_def_l_;
-  type_str_ = s.type_str_;
+  self_scm_ = SCM_EOL;
+  init ();
+  output_def_ = s.output_def_;
+  type_string_ = s.type_string_;
+
+  smobify_self ();
 }
 
 bool
 Translator::is_alias_b (String s) const
 {
-  return s == type_str_;
+  bool b  = s == type_string_;
+
+  for (SCM a = unsmob_translator_def (definition_)->type_aliases_;
+       !b && gh_pair_p (a); a = ly_cdr (a))
+    b = b || s == ly_scm2string (ly_car (a));
+
+  return b;
 }
 
 bool
-Translator::do_try_music (Music *)
+Translator::try_music (Music *)
 {
   return false;
 }
@@ -55,147 +70,82 @@ Translator::do_try_music (Music *)
 Moment
 Translator::now_mom () const
 {
-  return daddy_trans_l_->now_mom ();
-}
-
-
-void
-Translator::add_processing ()
-{
-  if (status > ORPHAN)
-    return;
-  
-  do_add_processing ();
-  status = VIRGIN;
+  return daddy_trans_->now_mom ();
 }
 
 void
-Translator::do_add_processing ()
+Translator::removal_processing ()
 {
+  finalize ();
 }
 
 void
-Translator::print () const
+Translator::do_announces ()
 {
-#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
+Music_output_def *
+Translator::get_output_def () const
 {
+  return output_def_;
 }
 
-
-
-
-void
-Translator::creation_processing ()
+SCM
+Translator::internal_get_property (SCM sym) const
 {
-  if (status >= CREATION_INITED)
-    return ;
-  
-  do_creation_processing ();
-  status = CREATION_INITED;
+  return daddy_trans_->internal_get_property (sym);
 }
 
 void
-Translator::post_move_processing ()
+Translator:: stop_translation_timestep ()
 {
-  if (status >= MOVE_INITED)
-    return;
-
-  creation_processing ();
-  do_post_move_processing ();
-  status = MOVE_INITED;
 }
 
 void
-Translator::removal_processing ()
-{
-  if (status == ORPHAN)
-    return;
-  creation_processing ();
-  do_removal_processing ();
-  // elegancy ...
-  // status = ORPHAN;
-}
-
-
-bool
-Translator::try_music (Music * r)
+Translator::start_translation_timestep ()
 {
-  if (status < MOVE_INITED)
-    post_move_processing ();
-
-  return do_try_music (r);
 }
 
 void
-Translator::process_music ()
+Translator::initialize ()
 {
-  if (status < PROCESSED_REQS)
-    post_move_processing ();
-  else if (status >= PROCESSED_REQS)
-    return; 
-  
-  status = PROCESSED_REQS;
-  do_process_music ();
 }
 
 void
-Translator::pre_move_processing ()
+Translator::finalize ()
 {
-  do_pre_move_processing ();
-  status = CREATION_INITED;
 }
 
 
+/*
 
-Music_output_def *
-Translator::output_def_l () const
-{
-  return output_def_l_;
-}
+  SMOBS
 
+*/
 SCM
-Translator::get_property (char const * id) const
+Translator::mark_smob (SCM sm)
 {
-  return daddy_trans_l_->get_property (ly_symbol2scm (id));
-}
+  Translator * me = (Translator*) SCM_CELL_WORD_1 (sm);
+  scm_gc_mark (me->simple_trans_list_);
+  scm_gc_mark (me->trans_group_list_);
+  scm_gc_mark (me->definition_);  
+  scm_gc_mark (me->properties_scm_);  
 
-SCM
-Translator::get_property (SCM sym) const
-{
-  return daddy_trans_l_->get_property (sym);
+  return me->properties_scm_;
 }
 
-void
-Translator:: do_pre_move_processing ()
-{
-}
-
-void
-Translator::do_post_move_processing ()
+SCM
+Translator::translator_description () const
 {
+  return SCM_EOL;
 }
 
-void
-Translator::do_process_music ()
+SCM
+Translator::static_translator_description ()const
 {
+  return SCM_EOL;
 }
 
-void
-Translator::do_creation_processing ()
-{
-}
 
-void
-Translator::do_removal_processing ()
-{
-}
+IMPLEMENT_SMOBS (Translator);
+IMPLEMENT_DEFAULT_EQUAL_P (Translator);