X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Ftranslator-group.hh;h=9a6940ac06be2fe26c9f3cdd56a70b5e284d428a;hb=b4242f976cf1245bfbbdf2b42dc4e98800dc40b5;hp=00da2cd3917804bd9d78a4d71a2d8cf6ac725649;hpb=3a0e9efb7f067e5b334ba0596b95e15d96d7cc49;p=lilypond.git

diff --git a/lily/include/translator-group.hh b/lily/include/translator-group.hh
index 00da2cd391..9a6940ac06 100644
--- a/lily/include/translator-group.hh
+++ b/lily/include/translator-group.hh
@@ -3,93 +3,89 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 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 "translator.hh"
-#include "cons.hh"
-#include "parray.hh"
-#include "scm-hash.hh"
+#include "std-vector.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_)
+      (*method_) (translator_);
+  }
+};
+
+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];
 
-// egcs
-typedef void (Translator::*Method_pointer)(void);
-typedef void (Translator::*Const_method_pointer)(void) const; 
+public:
+  VIRTUAL_COPY_CONSTRUCTOR (Translator_group, Translator_group);
+  DECLARE_SMOBS (Translator_group, dummy);
 
-/** Make some kind of #Element#s from Requests. Elements are made by
-  hierarchically grouped #Translator#s
-  */
-class Translator_group : public virtual Translator {
-  Array<String> consists_str_arr_;
-  Array<String> consists_end_str_arr_;
-  Array<String> accepts_str_arr_;
-  Scheme_hash_table properties_dict_;
+public:
+  virtual Translator_group *get_daddy_translator ()const;
+  virtual SCM get_simple_trans_list ();
+  virtual bool try_music (Music *req);
+  virtual void initialize ();
+  virtual void finalize ();
 
-  int iterator_count_;
-  friend class Interpretation_context_handle;
+  void stop_translation_timestep ();
+  void start_translation_timestep ();
 
-  Cons_list<Translator> trans_p_list_;
+  virtual void fetch_precomputable_methods (Translator_group_void_method[]);
 
-public:
-  SCM get_property (String type_str, Translator_group  **where_found_l) const;
-  void set_property (String var_name, SCM value);
-
-  String id_str_;
-
-  VIRTUAL_COPY_CONS(Translator);
-  
-  void set_acceptor (String accepts, bool add);
-  void set_element (String elt, bool add);  
-  void add_last_element (String elt);  
-  
-  Translator_group(Translator_group const &);
-  Translator_group();
-  void add_translator (Translator *trans_p);
-  
-  Link_array<Translator> nongroup_l_arr () const;
-  Link_array<Translator_group> group_l_arr () const;
-  
-  virtual Global_translator *global_l() { return 0; }
-  
-  /// 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) const;
-
-  Translator_group*get_default_interpreter();
-  virtual ~Translator_group ();
-  
+  Translator_group ();
+
+  void precomputed_translator_foreach (Translator_precompute_index);
+  void call_precomputed_self_method (Translator_precompute_index);
+
+  Context *context () const { return context_; }
 protected:
-  bool try_music_on_nongroup_children (Music *m);
-  
-  virtual void do_print () const;
-  virtual void do_process_requests ();
-  virtual void do_add_processing ();
-  virtual bool do_try_music (Music* req_l);       
-  virtual void do_pre_move_processing();
-  virtual void do_post_move_processing();   
-  virtual void do_creation_processing();
-  virtual void do_removal_processing();
-  virtual void each (Method_pointer);
-  virtual void each (Const_method_pointer) const;
+  SCM simple_trans_list_;
+  SCM accept_hash_table_;
+  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, accepted, read, write) foobar
+
+DECLARE_UNSMOB (Translator_group, translator_group);
+
 #endif // TRANSLATOR_GROUP_HH