#include "scm-hash.hh"
-Scheme_engraver::Scheme_engraver (SCM definition)
+Preinit_Scheme_engraver::Preinit_Scheme_engraver ()
{
- stop_translation_timestep_function_ = SCM_EOL;
- start_translation_timestep_function_ = SCM_EOL;
- process_music_function_ = SCM_EOL;
- process_acknowledged_function_ = SCM_EOL;
initialize_function_ = SCM_EOL;
finalize_function_ = SCM_EOL;
- interface_acknowledger_hash_ = SCM_EOL;
- interface_end_acknowledger_hash_ = SCM_EOL;
+ interface_acknowledger_hash_.set (SCM_EOL, SCM_EOL);
- must_be_last_ = false;
per_instance_listeners_ = SCM_EOL;
-
- init_from_scheme (definition);
+ for (int i = 0; i < TRANSLATOR_METHOD_PRECOMPUTE_COUNT; i++)
+ precomputable_methods_[i] = SCM_UNDEFINED;
}
Scheme_engraver::~Scheme_engraver ()
{
}
-// Extracts the value if callable, if not return #f.
+// Extracts the value if callable, if not return SCM_UNDEFINED;
static SCM
callable (SCM symbol, SCM defn)
{
SCM val = ly_assoc_get (symbol, defn, SCM_BOOL_F);
- return ly_is_procedure (val) ? val : SCM_BOOL_F;
+ return ly_is_procedure (val) ? val : SCM_UNDEFINED;
}
bool
}
void
-Scheme_engraver::init_from_scheme (SCM definition)
+Scheme_engraver::fetch_precomputable_methods (SCM ptrs[])
{
- start_translation_timestep_function_ = callable (ly_symbol2scm ("start-translation-timestep"),
- definition);
- stop_translation_timestep_function_ = callable (ly_symbol2scm ("stop-translation-timestep"),
- definition);
- process_music_function_ = callable (ly_symbol2scm ("process-music"), definition);
- process_acknowledged_function_ = callable (ly_symbol2scm ("process-acknowledged"),
- definition);
+ for (int i = 0; i < TRANSLATOR_METHOD_PRECOMPUTE_COUNT; i++)
+ ptrs[i] = precomputable_methods_[i];
+}
+
+Scheme_engraver::Scheme_engraver (SCM definition, Context *c)
+ : Engraver (c)
+{
+ precomputable_methods_[START_TRANSLATION_TIMESTEP]
+ = callable (ly_symbol2scm ("start-translation-timestep"), definition);
+ precomputable_methods_[STOP_TRANSLATION_TIMESTEP]
+ = callable (ly_symbol2scm ("stop-translation-timestep"), definition);
+ precomputable_methods_[PROCESS_MUSIC]
+ = callable (ly_symbol2scm ("process-music"), definition);
+ precomputable_methods_[PROCESS_ACKNOWLEDGED]
+ = callable (ly_symbol2scm ("process-acknowledged"), definition);
initialize_function_ = callable (ly_symbol2scm ("initialize"), definition);
finalize_function_ = callable (ly_symbol2scm ("finalize"), definition);
- SCM listeners = ly_assoc_get (ly_symbol2scm ("listeners"), definition, SCM_EOL);
-
- per_instance_listeners_ = SCM_EOL;
+ SCM p = ly_assoc_get (ly_symbol2scm ("listeners"), definition, SCM_EOL);
+ SCM listeners = SCM_EOL;
must_be_last_ = to_boolean (ly_assoc_get (ly_symbol2scm ("must-be-last"),
definition,
SCM_BOOL_F));
- for (SCM p = listeners; scm_is_pair (p); p = scm_cdr (p))
+ for (; scm_is_pair (p); p = scm_cdr (p))
{
SCM event_class = scm_caar (p);
SCM proc = scm_cdar (p);
// We should check the arity of the function?
// Record for later lookup.
- per_instance_listeners_ = scm_acons (event_class, proc, per_instance_listeners_);
+ listeners = scm_acons (event_class, proc, listeners);
}
- init_acknowledgers (ly_assoc_get (ly_symbol2scm ("acknowledgers"),
- definition, SCM_EOL),
- &interface_acknowledger_hash_);
+ SCM hash1 =
+ init_acknowledgers (ly_assoc_get (ly_symbol2scm ("acknowledgers"),
+ definition, SCM_EOL));
+ SCM hash2 =
+ init_acknowledgers (ly_assoc_get (ly_symbol2scm ("end-acknowledgers"),
+ definition, SCM_EOL));
+
+ per_instance_listeners_ = listeners;
+ interface_acknowledger_hash_.set (hash1, hash2);
+
+ // It's not defined whether Scheme_engraver::derived_mark is already
+ // active while the construction is underway, so we make sure we
+ // keep a version of everything on the stack that is not still
+ // covered by `definition'.
- init_acknowledgers (ly_assoc_get (ly_symbol2scm ("end-acknowledgers"),
- definition, SCM_EOL),
- &interface_end_acknowledger_hash_);
+ scm_remember_upto_here_2 (definition, listeners);
+ scm_remember_upto_here_2 (hash1, hash2);
// TODO: hook up description, props read/written, grobs created
// etc. to provide automatic documentation.
}
-void
-Scheme_engraver::init_acknowledgers (SCM alist,
- SCM *hash)
+SCM
+Scheme_engraver::init_acknowledgers (SCM alist)
{
- *hash = Scheme_hash_table::make_smob ();
+ SCM hash = Scheme_hash_table::make_smob ();
for (SCM p = alist; scm_is_pair (p); p = scm_cdr (p))
{
SCM iface = scm_caar (p);
if (!(ly_is_procedure (proc) && ly_is_symbol (iface)))
continue;
- unsmob<Scheme_hash_table>(*hash)->set (iface, proc);
+ unsmob<Scheme_hash_table>(hash)->set (iface, proc);
}
+ return hash;
}
SCM
return per_instance_listeners_;
}
-#define DISPATCH(what) \
- void \
- Scheme_engraver::what () \
- { \
- if (what ## _function_ != SCM_BOOL_F) \
- scm_call_1 (what ## _function_, self_scm ()); \
- }
-
-DISPATCH (start_translation_timestep);
-DISPATCH (stop_translation_timestep);
-DISPATCH (initialize);
-DISPATCH (finalize);
-DISPATCH (process_music);
-DISPATCH (process_acknowledged);
+void
+Scheme_engraver::initialize ()
+{
+ if (!SCM_UNBNDP (initialize_function_))
+ scm_call_1 (initialize_function_, self_scm ());
+}
+
+void
+Scheme_engraver::finalize ()
+{
+ if (!SCM_UNBNDP (finalize_function_))
+ scm_call_1 (finalize_function_, self_scm ());
+}
void
Scheme_engraver::derived_mark () const
{
- scm_gc_mark (start_translation_timestep_function_);
- scm_gc_mark (stop_translation_timestep_function_);
+ for (int i = 0; i < TRANSLATOR_METHOD_PRECOMPUTE_COUNT; i++)
+ scm_gc_mark (precomputable_methods_[i]);
+
scm_gc_mark (initialize_function_);
scm_gc_mark (finalize_function_);
- scm_gc_mark (process_music_function_);
- scm_gc_mark (process_acknowledged_function_);
scm_gc_mark (per_instance_listeners_);
- scm_gc_mark (interface_acknowledger_hash_);
- scm_gc_mark (interface_end_acknowledger_hash_);
+ scm_gc_mark (interface_acknowledger_hash_[START]);
+ scm_gc_mark (interface_acknowledger_hash_[STOP]);
}
-
-ADD_TRANSLATOR_FAMILY (Scheme_engraver);
projects / lilypond.git / blobdiff