]> git.donarmstrong.com Git - lilypond.git/blobdiff - lily/translator.cc
Run grand replace for 2015.
[lilypond.git] / lily / translator.cc
index 64cff836e6aa098813ec802b8523cd0e41ea2b9c..5798a0061c15d195bd8d008af773f1211d833fb3 100644 (file)
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -27,7 +27,6 @@
 #include "warn.hh"
 
 #include "translator.icc"
-#include "ly-smobs.icc"
 
 Translator::~Translator ()
 {
@@ -36,7 +35,6 @@ Translator::~Translator ()
 void
 Translator::init ()
 {
-  self_scm_ = SCM_EOL;
   daddy_context_ = 0;
   smobify_self ();
 }
@@ -56,9 +54,9 @@ Translator::Translator ()
   init ();
 }
 
-Translator::Translator (Translator const &src)
+Translator::Translator (Translator const &)
+  : Smob<Translator> ()
 {
-  (void) src;
   init ();
 }
 
@@ -122,7 +120,7 @@ Translator::connect_to_context (Context *c)
 {
   for (translator_listener_record *r = get_listener_list (); r; r = r->next_)
     c->events_below ()->add_listener (r->get_listener_ (this, r->event_class_),
-                                     r->event_class_);
+                                      r->event_class_);
 }
 
 void
@@ -130,43 +128,9 @@ Translator::disconnect_from_context (Context *c)
 {
   for (translator_listener_record *r = get_listener_list (); r; r = r->next_)
     c->events_below ()->remove_listener (r->get_listener_ (this, r->event_class_),
-                                        r->event_class_);
+                                         r->event_class_);
 }
 
-static SCM listened_event_class_table;
-void
-ensure_listened_hash ()
-{
-  if (!listened_event_class_table)
-    listened_event_class_table = scm_permanent_object (scm_c_make_hash_table (61));
-}
-
-
-LY_DEFINE (ly_get_listened_event_classes, "ly:get-listened-event-classes",
-          0, 0, 0, (),
-          "Return a list of all event classes that some translator listens"
-          " to.")
-{
-  ensure_listened_hash ();
-  return ly_hash_table_keys (listened_event_class_table);
-}
-
-LY_DEFINE (ly_is_listened_event_class, "ly:is-listened-event-class",
-          1, 0, 0, (SCM sym),
-          "Is @var{sym} a listened event class?")
-{
-  ensure_listened_hash ();
-  return scm_hashq_ref (listened_event_class_table, sym, SCM_BOOL_F);
-}
-
-void
-add_listened_event_class (SCM sym)
-{
-  ensure_listened_hash ();
-  scm_hashq_set_x (listened_event_class_table, sym, SCM_BOOL_T);
-}
-
-
 /*
   internally called once, statically, for each translator
   listener. Connects the name of an event class with a procedure that
@@ -177,18 +141,20 @@ add_listened_event_class (SCM sym)
  */
 void
 Translator::add_translator_listener (translator_listener_record **listener_list,
-                                    translator_listener_record *r,
-                                    Listener (*get_listener) (void *, SCM), 
-                                    const char *ev_class)
+                                     translator_listener_record *r,
+                                     Listener (*get_listener) (void *, SCM),
+                                     const char *ev_class)
 {
   /* ev_class is the C++ identifier name. Convert to scm symbol */
   string name = string (ev_class);
   name = replace_all (&name, '_', '-');
   name += "-event";
-  
-  SCM class_sym = scm_str2symbol (name.c_str ());
-  
-  add_listened_event_class (class_sym);
+
+  // we make the symbol permanent in order not to have to bother about
+  // the static translator_listener_record chains while garbage
+  // collecting.
+
+  SCM class_sym = scm_permanent_object (scm_from_locale_symbol (name.c_str ()));
 
   r->event_class_ = class_sym;
   r->get_listener_ = get_listener;
@@ -201,42 +167,41 @@ Translator::add_translator_listener (translator_listener_record **listener_list,
 */
 SCM
 Translator::static_translator_description (const char *grobs,
-                                          const char *desc,
-                                          translator_listener_record *listener_list,
-                                          const char *read, 
-                                          const char *write) const
+                                           const char *desc,
+                                           translator_listener_record *listener_list,
+                                           const char *read,
+                                           const char *write) const
 {
-  SCM static_properties = SCM_EOL;                                     
-
-  static_properties = scm_acons (ly_symbol2scm ("grobs-created"),      
-                                parse_symbol_list (grobs), static_properties);
-  
-  static_properties = scm_acons (ly_symbol2scm ("description"),        
-                                scm_from_locale_string (desc), static_properties); 
-  
+  SCM static_properties = SCM_EOL;
+
+  static_properties = scm_acons (ly_symbol2scm ("grobs-created"),
+                                 parse_symbol_list (grobs), static_properties);
+
+  static_properties = scm_acons (ly_symbol2scm ("description"),
+                                 scm_from_locale_string (desc), static_properties);
+
   SCM list = SCM_EOL;
   for (; listener_list; listener_list = listener_list->next_)
     list = scm_cons (listener_list->event_class_, list);
   static_properties = scm_acons (ly_symbol2scm ("events-accepted"),
-                                list, static_properties);
-  
-  static_properties = scm_acons (ly_symbol2scm ("properties-read"),    
-                                parse_symbol_list (read), static_properties); 
-  
-  static_properties = scm_acons (ly_symbol2scm ("properties-written"), 
-                                parse_symbol_list (write), static_properties); 
-  
-  return static_properties;                                            
+                                 list, static_properties);
+
+  static_properties = scm_acons (ly_symbol2scm ("properties-read"),
+                                 parse_symbol_list (read), static_properties);
+
+  static_properties = scm_acons (ly_symbol2scm ("properties-written"),
+                                 parse_symbol_list (write), static_properties);
+
+  return static_properties;
 }
-  
+
 /*
   SMOBS
 */
 SCM
-Translator::mark_smob (SCM sm)
+Translator::mark_smob ()
 {
-  Translator *me = (Translator *) SCM_CELL_WORD_1 (sm);
-  me->derived_mark ();
+  derived_mark ();
   return SCM_EOL;
 }
 
@@ -252,9 +217,7 @@ Translator::get_score_context () const
   return daddy_context_->get_score_context ();
 }
 
-IMPLEMENT_SMOBS (Translator);
-IMPLEMENT_DEFAULT_EQUAL_P (Translator);
-IMPLEMENT_TYPE_P (Translator, "ly:translator?");
+const char Translator::type_p_name_[] = "ly:translator?";
 
 bool
 Translator::must_be_last () const
@@ -268,19 +231,18 @@ Translator::derived_mark () const
 }
 
 int
-Translator::print_smob (SCM s, SCM port, scm_print_state *)
+Translator::print_smob (SCM port, scm_print_state *)
 {
-  Translator *me = (Translator *) SCM_CELL_WORD_1 (s);
   scm_puts ("#<Translator ", port);
-  scm_puts (me->class_name (), port);
+  scm_puts (class_name (), port);
   scm_puts (" >", port);
   return 1;
 }
 
 void
 add_acknowledger (Engraver_void_function_engraver_grob_info ptr,
-                 char const *func_name,
-                 vector<Acknowledge_information> *ack_array)
+                  char const *func_name,
+                  vector<Acknowledge_information> *ack_array)
 {
   Acknowledge_information inf;
   inf.function_ = ptr;
@@ -303,16 +265,15 @@ generic_get_acknowledger (SCM sym, vector<Acknowledge_information> const *ack_ar
   for (vsize i = 0; i < ack_array->size (); i++)
     {
       if (ack_array->at (i).symbol_ == sym)
-       return ack_array->at (i).function_;
+        return ack_array->at (i).function_;
     }
   return 0;
 }
 
-
 Moment
 get_event_length (Stream_event *e)
 {
-  Moment *m = unsmob_moment (e->get_property ("length"));
+  Moment *m = Moment::unsmob (e->get_property ("length"));
   if (m)
     return *m;
   else
@@ -323,7 +284,7 @@ Moment
 get_event_length (Stream_event *e, Moment now)
 {
   Moment len = get_event_length (e);
-  
+
   if (now.grace_part_)
     {
       len.grace_part_ = len.main_part_;
@@ -340,15 +301,15 @@ get_event_length (Stream_event *e, Moment now)
 bool
 internal_event_assignment (Stream_event **old_ev, Stream_event *new_ev, const char *function)
 {
-  if (*old_ev &&
-      !to_boolean (scm_equal_p ((*old_ev)->self_scm (), 
-                              new_ev->self_scm ())))
+  if (*old_ev
+      && !to_boolean (scm_equal_p ((*old_ev)->self_scm (),
+                                   new_ev->self_scm ())))
     {
       /* extract event class from function name */
       string ev_class = function;
 
       /* This assertion fails if EVENT_ASSIGNMENT was called outside a
-        translator listener. Don't do that. */
+         translator listener. Don't do that. */
       const char *prefix = "listen_";
       assert (0 == ev_class.find (prefix));
 
@@ -368,15 +329,15 @@ internal_event_assignment (Stream_event **old_ev, Stream_event *new_ev, const ch
 }
 
 ADD_TRANSLATOR (Translator,
-               /* doc */
-               "Base class.  Not instantiated.",
+                /* doc */
+                "Base class.  Not instantiated.",
 
-               /* create */
-               "",
+                /* create */
+                "",
 
-               /* read */
-               "",
+                /* read */
+                "",
 
-               /* write */
-               ""
-               );
+                /* write */
+                ""
+               );