X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftranslator.cc;h=03adb249f91a22bb4065e746183fab71e21248e4;hb=refs%2Ftags%2Frelease%2F1.5.9;hp=122b34d98e66f145da4626fb07c8de2ae26c0519;hpb=8aad615ea7bb31f49a0c2afc21eea5ff5de20437;p=lilypond.git

diff --git a/lily/translator.cc b/lily/translator.cc
index 122b34d98e..03adb249f9 100644
--- a/lily/translator.cc
+++ b/lily/translator.cc
@@ -3,44 +3,70 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
 #include "translator.hh"
 #include "debug.hh"
 #include "translator-group.hh"
+#include "translator-def.hh"
 
-#include "rational.hh"
+#include "moment.hh"
+#include "ly-smobs.icc"
+
+char const*
+Translator::name () const
+{
+  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_l_ =0;
+}
+
 Translator::Translator ()
 {
-  status = ORPHAN;
-  daddy_trans_l_ = 0;
+  init ();
   output_def_l_ = 0;
+  smobify_self ();
+
 }
 
 Translator::Translator (Translator const &s)
   : Input (s)
 {
-  status = ORPHAN;
-  daddy_trans_l_ =0;
+  init ();
   output_def_l_ = s.output_def_l_;
   type_str_ = s.type_str_;
+
+  smobify_self ();
 }
 
 bool
 Translator::is_alias_b (String s) const
 {
-  return s == type_str_;
+  bool b  = s == type_str_;
+
+  for (SCM a = unsmob_translator_def (definition_)->type_aliases_;
+       !b && gh_pair_p (a); a = gh_cdr (a))
+    b = b || s == ly_scm2string (gh_car (a));
+
+  return b;
 }
 
 bool
-Translator::do_try_music (Music *)
+Translator::try_music (Music *)
 {
   return false;
 }
@@ -53,113 +79,102 @@ Translator::now_mom () const
 }
 
 
+
+
+
+
 void
-Translator::add_processing ()
+Translator::removal_processing ()
 {
-  if (status > ORPHAN)
-    return;
-  
-  do_add_processing ();
-  status = VIRGIN;
+  finalize ();
 }
 
+
 void
-Translator::do_add_processing ()
+Translator::announces ()
 {
+  do_announces ();
 }
 
-void
-Translator::print () const
+
+Music_output_def *
+Translator::output_def_l () const
 {
-#ifndef NPRINT
-  DOUT << classname (this) << " {";
-  if (classname (this) != type_str_)
-    DOUT << "type = " << type_str_;
-  do_print ();
-  DOUT << "}\n";
-#endif
+  return output_def_l_;
 }
 
-void
-Translator::do_print () const
+SCM
+Translator::get_property (char const * id) const
 {
+  return daddy_trans_l_->get_property (ly_symbol2scm (id));
 }
 
-
-
-
-void
-Translator::creation_processing ()
+SCM
+Translator::get_property (SCM sym) const
 {
-  if (status >= CREATION_INITED)
-    return ;
-  
-  do_creation_processing ();
-  status = CREATION_INITED;
+  return daddy_trans_l_->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 ()
+Translator::start_translation_timestep ()
 {
-  if (status == ORPHAN)
-    return;
-  creation_processing ();
-  do_removal_processing ();
-  // elegancy ...
-  // status = ORPHAN;
 }
 
-
-bool
-Translator::try_music (Music * r)
+void
+Translator::do_announces ()
 {
-  if (status < MOVE_INITED)
-    post_move_processing ();
-
-  return do_try_music (r);
 }
 
 void
-Translator::process_requests ()
+Translator::initialize ()
 {
-  if (status < PROCESSED_REQS)
-    post_move_processing ();
-  else if (status >= PROCESSED_REQS)
-    return; 
-  
-  status = PROCESSED_REQS;
-  do_process_requests ();
 }
 
 void
-Translator::pre_move_processing ()
+Translator::finalize ()
 {
-  do_pre_move_processing ();
-  status = CREATION_INITED;
 }
 
 
+/*
+
+  SMOBS
 
-Music_output_def *
-Translator::output_def_l () const
+*/
+SCM
+Translator::mark_smob (SCM sm)
 {
-  return output_def_l_;
+  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_);  
+
+  return me->properties_scm_;
 }
 
-Scalar
-Translator::get_property (String id, Translator_group **where_l) const
+
+int
+Translator::print_smob (SCM s, SCM port, scm_print_state *)
 {
-  return daddy_trans_l_->get_property (id, where_l);
+  Translator *sc = (Translator *) gh_cdr (s);
+     
+  scm_puts ("#<Translator ", port);
+  scm_puts ((char *)sc->name (), port);
+  scm_display (sc->simple_trans_list_, port);
+  /*
+    don't try to print properties, that is too much hassle.
+   */
+  scm_puts (" >", port);
+  
+  return 1;
 }
 
+IMPLEMENT_UNSMOB (Translator, translator);
+IMPLEMENT_SMOBS (Translator);
+IMPLEMENT_DEFAULT_EQUAL_P (Translator);