X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftranslator-group.cc;h=5a5b5695f018a5539a3d434f3739e90b2ec02ae2;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=638c38bd9ce1c6d68aabe42a21dabf9f4c924520;hpb=0b544cfb7332615ef809b71b57ab656741311ae1;p=lilypond.git

diff --git a/lily/translator-group.cc b/lily/translator-group.cc
index 638c38bd9c..5a5b5695f0 100644
--- a/lily/translator-group.cc
+++ b/lily/translator-group.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>,
+  Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>,
                  Erik Sandberg <mandolaerik@gmail.com>
 
   LilyPond is free software: you can redistribute it and/or modify
@@ -39,7 +39,7 @@ void
 translator_each (SCM list, Translator_method method)
 {
   for (SCM p = list; scm_is_pair (p); p = scm_cdr (p))
-    (unsmob_translator (scm_car (p))->*method) ();
+    (Translator::unsmob (scm_car (p))->*method) ();
 }
 
 void
@@ -62,7 +62,7 @@ Translator_group::connect_to_context (Context *c)
                                     ly_symbol2scm ("AnnounceNewContext"));
   for (SCM tr_list = simple_trans_list_; scm_is_pair (tr_list); tr_list = scm_cdr (tr_list))
     {
-      Translator *tr = unsmob_translator (scm_car (tr_list));
+      Translator *tr = Translator::unsmob (scm_car (tr_list));
       tr->connect_to_context (c);
     }
 }
@@ -72,7 +72,7 @@ Translator_group::disconnect_from_context ()
 {
   for (SCM tr_list = simple_trans_list_; scm_is_pair (tr_list); tr_list = scm_cdr (tr_list))
     {
-      Translator *tr = unsmob_translator (scm_car (tr_list));
+      Translator *tr = Translator::unsmob (scm_car (tr_list));
       tr->disconnect_from_context (context_);
     }
   context_->event_source ()->remove_listener (GET_LISTENER (create_child_translator),
@@ -90,7 +90,7 @@ Translator_group::finalize ()
   Both filter_performers and filter_engravers used to use a direct dynamic_cast
   on the unsmobbed translator to be filtered, i.e.,
 
-  if (dynamic_cast<Performer *> (unsmob_translator (scm_car (*tail))))
+  if (dynamic_cast<Performer *> (Translator::unsmob (scm_car (*tail))))
 
   but this caused mysterious optimisation issues in several GUB builds.  See
   issue #818 for the background to this change.
@@ -101,7 +101,7 @@ filter_performers (SCM ell)
   SCM *tail = &ell;
   for (SCM p = ell; scm_is_pair (p); p = scm_cdr (p))
     {
-      if (unsmob_performer (scm_car (*tail)))
+      if (Performer::is_smob (scm_car (*tail)))
         *tail = scm_cdr (*tail);
       else
         tail = SCM_CDRLOC (*tail);
@@ -115,7 +115,7 @@ filter_engravers (SCM ell)
   SCM *tail = &ell;
   for (SCM p = ell; scm_is_pair (p); p = scm_cdr (p))
     {
-      if (unsmob_engraver (scm_car (*tail)))
+      if (Engraver::is_smob (scm_car (*tail)))
         *tail = scm_cdr (*tail);
       else
         tail = SCM_CDRLOC (*tail);
@@ -149,11 +149,11 @@ IMPLEMENT_LISTENER (Translator_group, create_child_translator);
 void
 Translator_group::create_child_translator (SCM sev)
 {
-  Stream_event *ev = unsmob_stream_event (sev);
+  Stream_event *ev = Stream_event::unsmob (sev);
   // get from AnnounceNewContext
   SCM cs = ev->get_property ("context");
-  Context *new_context = unsmob_context (cs);
-  Context_def *def = unsmob_context_def (new_context->get_definition ());
+  Context *new_context = Context::unsmob (cs);
+  Context_def *def = Context_def::unsmob (new_context->get_definition ());
   SCM ops = new_context->get_definition_mods ();
 
   SCM trans_names = def->get_translator_names (ops);
@@ -249,7 +249,7 @@ precomputed_recurse_over_translators (Context *c, Translator_precompute_index id
 
   for (SCM s = c->children_contexts (); scm_is_pair (s);
        s = scm_cdr (s))
-    precomputed_recurse_over_translators (unsmob_context (scm_car (s)), idx, dir);
+    precomputed_recurse_over_translators (Context::unsmob (scm_car (s)), idx, dir);
 
   if (tg && dir == UP)
     {
@@ -273,7 +273,7 @@ recurse_over_translators (Context *c, Translator_method ptr,
 
   for (SCM s = c->children_contexts (); scm_is_pair (s);
        s = scm_cdr (s))
-    recurse_over_translators (unsmob_context (scm_car (s)), ptr, tg_ptr, dir);
+    recurse_over_translators (Context::unsmob (scm_car (s)), ptr, tg_ptr, dir);
 
   if (tg && dir == UP)
     {
@@ -302,7 +302,7 @@ Translator_group::precompute_method_bindings ()
 {
   for (SCM s = simple_trans_list_; scm_is_pair (s); s = scm_cdr (s))
     {
-      Translator *tr = unsmob_translator (scm_car (s));
+      Translator *tr = Translator::unsmob (scm_car (s));
       Translator_void_method_ptr ptrs[TRANSLATOR_METHOD_PRECOMPUTE_COUNT];
       tr->fetch_precomputable_methods (ptrs);
 
@@ -343,29 +343,23 @@ Translator_group::~Translator_group ()
 {
 }
 
-#include "ly-smobs.icc"
 
-IMPLEMENT_SMOBS (Translator_group);
-IMPLEMENT_DEFAULT_EQUAL_P (Translator_group);
-IMPLEMENT_TYPE_P (Translator_group, "ly:translator-group?");
+const char Translator_group::type_p_name_[] = "ly:translator-group?";
 
 int
-Translator_group::print_smob (SCM s, SCM port, scm_print_state *)
+Translator_group::print_smob (SCM port, scm_print_state *)
 {
-  Translator_group *me = (Translator_group *) SCM_CELL_WORD_1 (s);
   scm_puts ("#<Translator_group ", port);
-  scm_puts (me->class_name (), port);
-  scm_display (me->simple_trans_list_, port);
+  scm_puts (class_name (), port);
+  scm_display (simple_trans_list_, port);
   scm_puts (" >", port);
   return 1;
 }
 
 SCM
-Translator_group::mark_smob (SCM smob)
+Translator_group::mark_smob ()
 {
-  Translator_group *me = (Translator_group *)SCM_CELL_WORD_1 (smob);
-
-  me->derived_mark ();
-  scm_gc_mark (me->protected_events_);
-  return me->simple_trans_list_;
+  derived_mark ();
+  scm_gc_mark (protected_events_);
+  return simple_trans_list_;
 }