release: 1.3.92

[lilypond.git] / lily / translator.cc

diff --git a/lily/translator.cc b/lily/translator.cc
index 515a85af9bbba3ea26dabcee6468d4fd5d9474f6..90edc46fbbaa3423bc62f94c9b6612f2a3346e04 100644 (file)
--- a/lily/translator.cc
+++ b/lily/translator.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -12,6 +12,7 @@
 #include "translator-group.hh"
 
 #include "moment.hh"
+#include "ly-smobs.icc"
 
 char const*
 Translator::name() const
@@ -23,20 +24,33 @@ Translator::~Translator ()
 {
 }
 
+void
+Translator::init ()
+{
+  status_ = ORPHAN;
+  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
@@ -62,11 +76,11 @@ Translator::now_mom () const
 void
 Translator::add_processing ()
 {
-  if (status > ORPHAN)
+  if (status_ > ORPHAN)
     return;
   
   do_add_processing ();
-  status = VIRGIN;
+  status_ = VIRGIN;
 }
 
 void
@@ -97,62 +111,62 @@ Translator::do_print () const
 void
 Translator::creation_processing ()
 {
-  if (status >= CREATION_INITED)
+  if (status_ >= CREATION_INITED)
     return ;
   
   do_creation_processing ();
-  status = CREATION_INITED;
+  status_ = CREATION_INITED;
 }
 
 void
 Translator::post_move_processing ()
 {
-  if (status >= MOVE_INITED)
+  if (status_ >= MOVE_INITED)
     return;
 
   creation_processing ();
   do_post_move_processing ();
-  status = MOVE_INITED;
+  status_ = MOVE_INITED;
 }
 
 void
 Translator::removal_processing ()
 {
-  if (status == ORPHAN)
+  if (status_ == ORPHAN)
     return;
   creation_processing ();
   do_removal_processing ();
   // elegancy ...
-  // status = ORPHAN;
+  // status_ = ORPHAN;
 }
 
 
 bool
 Translator::try_music (Music * r)
 {
-  if (status < MOVE_INITED)
+  if (status_ < MOVE_INITED)
     post_move_processing ();
 
   return do_try_music (r);
 }
 
 void
-Translator::process_requests ()
+Translator::process_music ()
 {
-  if (status < PROCESSED_REQS)
+  if (status_ < PROCESSED_REQS)
     post_move_processing ();
-  else if (status >= PROCESSED_REQS)
+  else if (status_ >= PROCESSED_REQS)
     return; 
   
-  status = PROCESSED_REQS;
-  do_process_requests ();
+  status_ = PROCESSED_REQS;
+  do_process_music ();
 }
 
 void
 Translator::pre_move_processing ()
 {
   do_pre_move_processing ();
-  status = CREATION_INITED;
+  status_ = CREATION_INITED;
 }
 
 
@@ -164,27 +178,81 @@ Translator::output_def_l () const
 }
 
 SCM
-Translator::get_property (String id, Translator_group **where_l) const
+Translator::get_property (char const * id) const
 {
-  return daddy_trans_l_->get_property (ly_symbol2scm (id.ch_C()), where_l);
+  return daddy_trans_l_->get_property (ly_symbol2scm (id));
 }
 
 SCM
-Translator::get_property (SCM sym,
-                         Translator_group **where_l) const
+Translator::get_property (SCM sym) const
 {
-  return daddy_trans_l_->get_property (sym, where_l);
+  return daddy_trans_l_->get_property (sym);
 }
 
-
-
 void
-Translator:: do_pre_move_processing(){}
+Translator:: do_pre_move_processing ()
+{
+}
+
 void
-Translator::do_post_move_processing(){}
+Translator::do_post_move_processing ()
+{
+}
+
 void
-Translator::do_process_requests () {}
+Translator::do_process_music ()
+{
+}
+
 void
-Translator::do_creation_processing() {}
+Translator::do_creation_processing ()
+{
+}
+
 void
-Translator::do_removal_processing(){}
+Translator::do_removal_processing ()
+{
+}
+
+
+/*
+
+  SMOBS
+
+*/
+SCM
+Translator::mark_smob (SCM sm)
+{
+  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_;
+}
+
+
+int
+Translator::print_smob (SCM s, SCM port, scm_print_state *)
+{
+  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);