Imported Upstream version 2.19.45

[lilypond.git] / lily / include / translator-group.hh

diff --git a/lily/include/translator-group.hh b/lily/include/translator-group.hh
index ad044de86075d6d9e9178d05a4ed11fd8d81335d..d4500ef2b4e170a4312b35746fc01a47d4d8429f 100644 (file)
--- a/lily/include/translator-group.hh
+++ b/lily/include/translator-group.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2012 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
@@ -20,52 +20,29 @@
 #ifndef TRANSLATOR_GROUP_HH
 #define TRANSLATOR_GROUP_HH
 
+#include "callback.hh"
 #include "listener.hh"
 #include "translator.hh"
 
-typedef void (Translator:: *Translator_method) (void);
-typedef void (Translator_group:: *Translator_group_method) (void);
-typedef void (*Translator_group_void_method) (Translator_group *);
-
-struct Translator_method_binding
-{
-  Translator *translator_;
-  Translator_void_method_ptr method_;
-
-  Translator_method_binding ()
-  {
-  }
-  Translator_method_binding (Translator *tr, Translator_void_method_ptr ptr)
-  {
-    translator_ = tr;
-    method_ = ptr;
-  }
-  void invoke ()
-  {
-    if (method_)
-      (translator_->*method_) ();
-  }
-};
-
-class Translator_group
+class Translator_group : public Smob<Translator_group>
 {
+public:
+  SCM mark_smob () const;
+  int print_smob (SCM, scm_print_state *) const;
+  static const char * const type_p_name_;
+  virtual ~Translator_group ();
 private:
   void precompute_method_bindings ();
-  vector<Translator_method_binding>
+  vector<Method_instance>
   precomputed_method_bindings_[TRANSLATOR_METHOD_PRECOMPUTE_COUNT];
 
-  Translator_group_void_method
-  precomputed_self_method_bindings_[TRANSLATOR_METHOD_PRECOMPUTE_COUNT];
-
   SCM protected_events_;
 
-  DECLARE_LISTENER (create_child_translator);
+  void create_child_translator (SCM);
 
 public:
-  VIRTUAL_COPY_CONSTRUCTOR (Translator_group, Translator_group);
-  DECLARE_SMOBS (Translator_group);
+  DECLARE_CLASSNAME (Translator_group);
 
-public:
   virtual void connect_to_context (Context *c);
   virtual void disconnect_from_context ();
   virtual SCM get_simple_trans_list ();
@@ -77,12 +54,9 @@ public:
   void stop_translation_timestep ();
   void start_translation_timestep ();
 
-  virtual void fetch_precomputable_methods (Translator_group_void_method[]);
-
   Translator_group ();
 
   void precomputed_translator_foreach (Translator_precompute_index);
-  void call_precomputed_self_method (Translator_precompute_index);
 
   Context *context () const { return context_; }
 protected:
@@ -94,14 +68,13 @@ protected:
 };
 
 SCM names_to_translators (SCM namelist, Context *tg);
-void recurse_over_translators (Context *c, Translator_method ptr,
-                               Translator_group_method ptr2, Direction);
+void recurse_over_translators (Context *c, SCM tr_method,
+                               SCM tr_group_method, Direction);
 void precomputed_recurse_over_translators (Context *c, Translator_precompute_index idx, Direction dir);
 Translator_group *get_translator_group (SCM sym);
 
 #define foobar
 #define ADD_TRANSLATOR_GROUP(classname, desc, grobs, read, write) foobar
 
-DECLARE_UNSMOB (Translator_group, translator_group);
 
 #endif // TRANSLATOR_GROUP_HH