if (do_internal_type_checking_global)
{
if (!ly_is_procedure (v)
- && !is_simple_closure (v)
- && !is_unpure_pure_container (v)
+ && !Simple_closure::is_smob (v)
+ && !Unpure_pure_container::is_smob (v)
&& v != ly_symbol2scm ("calculation-in-progress"))
type_check_assignment (sym, v, ly_symbol2scm ("backend-type?"));
if (do_internal_type_checking_global && scm_is_pair (handle))
{
SCM val = scm_cdr (handle);
- if (!ly_is_procedure (val) && !is_simple_closure (val) && !is_unpure_pure_container (val))
+ if (!ly_is_procedure (val) && !Simple_closure::is_smob (val)
+ && !Unpure_pure_container::is_smob (val))
type_check_assignment (sym, val, ly_symbol2scm ("backend-type?"));
check_interfaces_for_property (this, sym);
}
#endif
- if (is_unpure_pure_container (val))
- val = unpure_pure_container_unpure_part (val);
+ if (Unpure_pure_container *upc = Unpure_pure_container::unsmob (val))
+ val = upc->unpure_part ();
if (ly_is_procedure (val)
- || is_simple_closure (val))
+ || Simple_closure::is_smob (val))
{
Grob *me = ((Grob *)this);
val = me->try_callback_on_alist (&me->mutable_property_alist_, sym, val);
if (ly_is_procedure (val))
return call_pure_function (val, scm_list_1 (self_scm ()), start, end);
- if (is_unpure_pure_container (val)) {
+ if (Unpure_pure_container *upc = Unpure_pure_container::unsmob (val)) {
// Do cache, if the function ignores 'start' and 'end'
- if (is_unchanging_unpure_pure_container (val))
+ if (upc->is_unchanging ())
return internal_get_property (sym);
else
return call_pure_function (val, scm_list_1 (self_scm ()), start, end);
}
- if (is_simple_closure (val))
+ if (Simple_closure *sc = Simple_closure::unsmob (val))
return evaluate_with_simple_closure (self_scm (),
- simple_closure_expression (val),
+ sc->expression (),
true, start, end);
return val;
}
SCM value = SCM_EOL;
if (ly_is_procedure (proc))
value = scm_call_1 (proc, self_scm ());
- else if (is_simple_closure (proc))
+ else if (Simple_closure *sc = Simple_closure::unsmob (proc))
{
value = evaluate_with_simple_closure (self_scm (),
- simple_closure_expression (proc),
+ sc->expression (),
false, 0, 0);
}
{
SCM val = scm_cdr (s);
if (ly_is_procedure (val)
- || is_simple_closure (val)
- || is_unpure_pure_container (val))
+ || Simple_closure::is_smob (val)
+ || Unpure_pure_container::is_smob (val))
{
Grob *me = ((Grob *)this);
val = me->try_callback_on_alist (&me->object_alist_, sym, val);
SCM
call_pure_function (SCM unpure, SCM args, int start, int end)
{
- if (is_unpure_pure_container (unpure))
+ if (Unpure_pure_container *upc = Unpure_pure_container::unsmob (unpure))
{
- SCM pure = unpure_pure_container_pure_part (unpure);
+ SCM pure = upc->pure_part ();
- if (is_simple_closure (pure))
+ if (Simple_closure *sc = Simple_closure::unsmob (pure))
{
- SCM expr = simple_closure_expression (pure);
+ SCM expr = sc->expression ();
return evaluate_with_simple_closure (scm_car (args), expr, true, start, end);
}
return pure;
}
- if (is_simple_closure (unpure))
+ if (Simple_closure *sc = Simple_closure::unsmob (unpure))
{
- SCM expr = simple_closure_expression (unpure);
+ SCM expr = sc->expression ();
return evaluate_with_simple_closure (scm_car (args), expr, true, start, end);
}