X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Ftranslator-group.hh;h=b0e46d6f7ff90fb7eb1443d428d93121b2473bb6;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=50a713be690869bb6f1554495fd5e7befc8763c3;hpb=0817e0513d1016ff22a633b6fee20ddba2a062f2;p=lilypond.git

diff --git a/lily/include/translator-group.hh b/lily/include/translator-group.hh
index 50a713be69..b0e46d6f7f 100644
--- a/lily/include/translator-group.hh
+++ b/lily/include/translator-group.hh
@@ -3,78 +3,94 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-
 #ifndef TRANSLATOR_GROUP_HH
 #define TRANSLATOR_GROUP_HH
 
-#include "string.hh"
-#include "lily-proto.hh"
-#include "virtual-methods.hh"
+#include "listener.hh"
 #include "translator.hh"
-#include "parray.hh"
-#include "smobs.hh"
 
-// egcs
-typedef void (Translator::*Method_pointer) (void);
-#define set_property(x,y) internal_set_property(ly_symbol2scm(x),y)
+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_)
+      (*method_) (translator_);
+  }
+};
 
-class Scheme_hash_table;
+class Translator_group
+{
+private:
+  void precompute_method_bindings ();
+  vector<Translator_method_binding>
+  precomputed_method_bindings_[TRANSLATOR_METHOD_PRECOMPUTE_COUNT];
 
+  Translator_group_void_method
+  precomputed_self_method_bindings_[TRANSLATOR_METHOD_PRECOMPUTE_COUNT];
 
-/** Make some kind of Elements from Requests. Elements are made by
-  hierarchically grouped Translators
-  */
-class Translator_group : public virtual Translator {
+  SCM protected_events_;
 
-  Scheme_hash_table *properties_dict () const;
-  int iterator_count_;
+  DECLARE_LISTENER (create_child_translator);
 
-  friend class Interpretation_context_handle;
-protected:
-  ~Translator_group ();
 public:
-  SCM add_translator (SCM, Translator*);
-  void execute_single_pushpop_property (SCM prop, SCM sym, SCM val);
-  SCM internal_get_property (SCM name_sym) const;
+  VIRTUAL_COPY_CONSTRUCTOR (Translator_group, Translator_group);
+  DECLARE_SMOBS (Translator_group);
 
-  void unset_property (SCM var_sym);
-  void internal_set_property (SCM var_sym, SCM value);  
-  Translator_group *where_defined (SCM name_sym) const;
+public:
+  virtual void connect_to_context (Context *c);
+  virtual void disconnect_from_context ();
+  virtual SCM get_simple_trans_list ();
+  virtual void initialize ();
+  virtual void finalize ();
+
+  void protect_event (SCM ev);
 
-  String id_str_;
+  void stop_translation_timestep ();
+  void start_translation_timestep ();
+
+  virtual void fetch_precomputable_methods (Translator_group_void_method[]);
 
-  VIRTUAL_COPY_CONS (Translator);
-  Translator_group (Translator_group const &);
   Translator_group ();
-  void add_group_translator (Translator *trans_p);
-  
-  /// Score_register = 0, Staff_registers = 1, etc)
-  Translator_group* ancestor_l (int l=1);
-  int depth_i () const;
-  bool is_bottom_translator_b () const;
-  bool removable_b () const;
-  void terminate_translator (Translator*r_l);
-  Translator *remove_translator_p (Translator*trans_l);
-  void check_removal ();
-  // Translator *get_simple_translator (String) const;
-  Translator_group *find_existing_translator_l (String n, String id);
-  Translator_group *find_create_translator_l (String n, String id);
-  Link_array<Translator_group> path_to_acceptable_translator (String alias, Music_output_def*) const;
-  Translator_group*get_default_interpreter ();
 
-public:
-  bool try_music_on_nongroup_children (Music *m);
-  
-  virtual void do_announces ();
-  virtual bool try_music (Music* req_l);       
-  virtual void stop_translation_timestep ();
-  virtual void start_translation_timestep ();   
-  virtual void initialize ();
-  virtual void finalize ();
-  virtual void each (Method_pointer);
+  void precomputed_translator_foreach (Translator_precompute_index);
+  void call_precomputed_self_method (Translator_precompute_index);
+
+  Context *context () const { return context_; }
+protected:
+  SCM simple_trans_list_;
+  Context *context_;
+
+  friend class Context_def;
+  virtual void derived_mark () const;
 };
 
+SCM names_to_translators (SCM namelist, Context *tg);
+void recurse_over_translators (Context *c, Translator_method ptr,
+			       Translator_group_method ptr2, 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