* gcc-3.4 snapshot: 3.4.0 20040215 (prerelease) compile fixes, and

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

diff --git a/lily/include/translator-group.hh b/lily/include/translator-group.hh
index e1d91d1aeab4c7fa0328b2ae8641e3871205ae97..f0ec7b3e2b4994289a38c4666b00e0cf6562bff3 100644 (file)
--- a/lily/include/translator-group.hh
+++ b/lily/include/translator-group.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -14,83 +14,25 @@
 #include "lily-proto.hh"
 #include "virtual-methods.hh"
 #include "translator.hh"
-#include "cons.hh"
 #include "parray.hh"
-#include "scm-hash.hh"
+#include "smobs.hh"
 
+typedef void (Translator::*Translator_method) (void);
 
-// egcs
-typedef void (Translator::*Method_pointer)(void);
-typedef void (Translator::*Const_method_pointer)(void) const; 
-
-/** 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_;
-
-  int iterator_count_;
-  friend class Interpretation_context_handle;
-
-  Cons_list<Translator> trans_p_list_;
-
+class Translator_group : public virtual Translator
+{
 public:
-  SCM get_property (SCM name_sym, 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 ();
-
+  VIRTUAL_COPY_CONSTRUCTOR (Translator, Translator_group);
+  virtual Translator_group* get_daddy_translator ()const;
+  virtual SCM get_simple_trans_list ();
+  virtual bool try_music (Music* req);       
+  virtual void initialize ();
+};
 
 
-  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;
+SCM names_to_translators (SCM namelist, Context*tg);
+void recurse_down_translators (Context * c, Translator_method ptr, Direction);
+void translator_each (SCM list, Translator_method method);
 
-  Translator_group*get_default_interpreter();
-  virtual ~Translator_group ();
-  
-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;
-};
 
 #endif // TRANSLATOR_GROUP_HH