Issue 4997/2: Use Preinit class in Scheme_engraver

[lilypond.git] / lily / include / scheme-engraver.hh

diff --git a/lily/include/scheme-engraver.hh b/lily/include/scheme-engraver.hh
index 7fb829e3c4d2a2f7fc95eb39b02ae177ff413779..2eb2f30379d9b339833a65608b1b351f4311c250 100644 (file)
--- a/lily/include/scheme-engraver.hh
+++ b/lily/include/scheme-engraver.hh
@@ -24,11 +24,11 @@
 
 #include "engraver.hh"
 
-class Scheme_engraver : public Engraver
+class Scheme_engraver : public Preinit<Scheme_engraver>, public Engraver
 {
-  void init_from_scheme (SCM definition);
 public:
   TRANSLATOR_FAMILY_DECLARATIONS (Scheme_engraver);
+  void pre_init ();
   Scheme_engraver (SCM definition);
 
 protected:
@@ -41,16 +41,13 @@ protected:
   virtual bool must_be_last () const;
 
 private:
-  virtual SCM get_acknowledger (SCM sym)
+  virtual SCM get_acknowledger (SCM sym, Direction start_end)
   {
-    return generic_get_acknowledger (sym, interface_acknowledger_hash_);
-  }
-  virtual SCM get_end_acknowledger (SCM sym)
-  {
-    return generic_get_acknowledger (sym, interface_end_acknowledger_hash_);
+    return generic_get_acknowledger
+      (sym, interface_acknowledger_hash_[start_end]);
   }
 
-  void init_acknowledgers (SCM alist, SCM *hash);
+  SCM init_acknowledgers (SCM alist);
   // For now no description.  In future, something derived from the
   // definition might make sense.
   SCM translator_description () const { return SCM_EOL; }
@@ -62,8 +59,7 @@ private:
   SCM precomputable_methods_ [TRANSLATOR_METHOD_PRECOMPUTE_COUNT];
 
   // hashq table of interface-symbol -> scheme-function
-  SCM interface_acknowledger_hash_;
-  SCM interface_end_acknowledger_hash_;
+  Drul_array<SCM> interface_acknowledger_hash_;
 
   // Alist of listened-symbol . scheme-function
   SCM per_instance_listeners_;