#include "item.hh"
#include "program-option.hh"
#include "profile.hh"
+#include "simple-closure.hh"
SCM
Grob::get_property_alist_chain (SCM def) const
SCM_UNDEFINED);
}
-SCM
-Grob::get_interfaces () const
-{
- return interfaces_;
-}
-
extern void check_interfaces_for_property (Grob const *me, SCM sym);
if (do_internal_type_checking_global)
{
if (!ly_is_procedure (v)
+ && !is_simple_closure (v)
+ && v != ly_symbol2scm ("calculation-in-progress")
&& !type_check_assignment (sym, v, ly_symbol2scm ("backend-type?")))
abort ();
check_interfaces_for_property (this, sym);
{
SCM val = scm_cdr (handle);
if (!ly_is_procedure (val)
+ && !is_simple_closure (val)
&& !type_check_assignment (sym, val,
ly_symbol2scm ("backend-type?")))
abort ();
Grob::internal_get_property (SCM sym) const
{
SCM val = get_property_data (sym);
- if (ly_is_procedure (val) || is_callback_chain (val))
+ if (ly_is_procedure (val)
+ || is_simple_closure (val))
{
val = ((Grob*)this)->try_callback (sym, val);
}
#ifndef NDEBUG
#include "protected-scm.hh"
+
Protected_scm grob_property_callback_stack = SCM_EOL;
bool debug_property_callbacks = 0;
#endif
SCM value = SCM_EOL;
if (ly_is_procedure (proc))
value = scm_call_1 (proc, self_scm ());
- else if (is_callback_chain (proc))
+ else if (is_simple_closure (proc))
{
- for (SCM s = callback_chain_extract_procedures (proc);
- scm_is_pair (s); s = scm_cdr (s))
- {
- value = scm_call_2 (scm_car (s), self_scm (), value);
- }
+ value = evaluate_with_simple_closure (self_scm (),
+ simple_closure_expression (proc));
}
- else
- assert (false);
-
#ifndef NDEBUG
if (debug_property_callbacks)
grob_property_callback_stack = scm_cdr (grob_property_callback_stack);
return (s == SCM_BOOL_F) ? SCM_EOL : scm_cdr (s);
}
-void
-Grob::substitute_object_links (SCM crit, SCM orig)
+bool
+Grob::is_live () const
{
- set_break_subsititution (crit);
- object_alist_ = substitute_object_alist (orig, object_alist_);
+ return immutable_property_alist_ != SCM_EOL;
}
+
bool
-Grob::is_live () const
+Grob::internal_has_interface (SCM k)
{
- return immutable_property_alist_ != SCM_EOL;
+ return scm_c_memq (k, interfaces_) != SCM_BOOL_F;
}