#include "spanner.hh"
#include "international.hh"
#include "item.hh"
-#include "misc.hh"
-#include "item.hh"
#include "program-option.hh"
#include "profile.hh"
#include "simple-closure.hh"
#include "warn.hh"
#include "protected-scm.hh"
-Protected_scm grob_property_callback_stack = SCM_EOL;
+Protected_scm grob_property_callback_stack (SCM_EOL);
extern bool debug_property_callbacks;
-#ifndef NDEBUG
+#ifdef DEBUG
static void
print_property_callback_stack ()
{
}
#endif
-static Protected_scm modification_callback = SCM_EOL;
-static Protected_scm cache_callback = SCM_EOL;
+static Protected_scm modification_callback (SCM_EOL);
+static Protected_scm cache_callback (SCM_EOL);
/*
FIXME: this should use ly:set-option interface instead.
int line,
char const *fun)
{
-#ifndef NDEBUG
+#ifdef DEBUG
if (ly_is_procedure (modification_callback))
scm_apply_0 (modification_callback,
scm_list_n (self_scm (),
if (do_internal_type_checking_global)
{
if (!ly_is_procedure (v)
- && !Simple_closure::is_smob (v)
- && !Unpure_pure_container::is_smob (v)
+ && !unsmob<Simple_closure> (v)
+ && !unsmob<Unpure_pure_container> (v)
&& !scm_is_eq (v, ly_symbol2scm ("calculation-in-progress")))
type_check_assignment (sym, v, ly_symbol2scm ("backend-type?"));
SCM
Grob::internal_get_property_data (SCM sym) const
{
-#ifndef NDEBUG
+#ifdef DEBUG
if (profile_property_accesses)
note_property_access (&grob_property_lookup_table, sym);
#endif
if (do_internal_type_checking_global && scm_is_pair (handle))
{
SCM val = scm_cdr (handle);
- if (!ly_is_procedure (val) && !Simple_closure::is_smob (val)
- && !Unpure_pure_container::is_smob (val))
+ if (!ly_is_procedure (val) && !unsmob<Simple_closure> (val)
+ && !unsmob<Unpure_pure_container> (val))
type_check_assignment (sym, val, ly_symbol2scm ("backend-type?"));
check_interfaces_for_property (this, sym);
{
SCM val = get_property_data (sym);
-#ifndef NDEBUG
+#ifdef DEBUG
if (scm_is_eq (val, ly_symbol2scm ("calculation-in-progress")))
{
programming_error (to_string ("cyclic dependency: calculation-in-progress encountered for #'%s (%s)",
}
#endif
- if (Unpure_pure_container *upc = Unpure_pure_container::unsmob (val))
+ if (Unpure_pure_container *upc = unsmob<Unpure_pure_container> (val))
val = upc->unpure_part ();
if (ly_is_procedure (val)
- || Simple_closure::is_smob (val))
+ || unsmob<Simple_closure> (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 (Unpure_pure_container *upc = Unpure_pure_container::unsmob (val)) {
+ if (Unpure_pure_container *upc = unsmob<Unpure_pure_container> (val)) {
// Do cache, if the function ignores 'start' and 'end'
if (upc->is_unchanging ())
return internal_get_property (sym);
return call_pure_function (val, scm_list_1 (self_scm ()), start, end);
}
- if (Simple_closure *sc = Simple_closure::unsmob (val))
+ if (Simple_closure *sc = unsmob<Simple_closure> (val))
return evaluate_with_simple_closure (self_scm (),
sc->expression (),
true, start, end);
*/
*alist = scm_assq_set_x (*alist, sym, marker);
-#ifndef NDEBUG
+#ifdef DEBUG
if (debug_property_callbacks)
grob_property_callback_stack = scm_cons (scm_list_3 (self_scm (), sym, proc), grob_property_callback_stack);
#endif
SCM value = SCM_EOL;
if (ly_is_procedure (proc))
value = scm_call_1 (proc, self_scm ());
- else if (Simple_closure *sc = Simple_closure::unsmob (proc))
+ else if (Simple_closure *sc = unsmob<Simple_closure> (proc))
{
value = evaluate_with_simple_closure (self_scm (),
sc->expression (),
false, 0, 0);
}
-#ifndef NDEBUG
+#ifdef DEBUG
if (debug_property_callbacks)
grob_property_callback_stack = scm_cdr (grob_property_callback_stack);
#endif
}
else
{
-#ifndef NDEBUG
+#ifdef DEBUG
if (ly_is_procedure (cache_callback))
scm_apply_0 (cache_callback,
scm_list_n (self_scm (),
{
SCM val = scm_cdr (s);
if (ly_is_procedure (val)
- || Simple_closure::is_smob (val)
- || Unpure_pure_container::is_smob (val))
+ || unsmob<Simple_closure> (val)
+ || unsmob<Unpure_pure_container> (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 (Unpure_pure_container *upc = Unpure_pure_container::unsmob (unpure))
+ if (Unpure_pure_container *upc = unsmob<Unpure_pure_container> (unpure))
{
SCM pure = upc->pure_part ();
- if (Simple_closure *sc = Simple_closure::unsmob (pure))
+ if (Simple_closure *sc = unsmob<Simple_closure> (pure))
{
SCM expr = sc->expression ();
return evaluate_with_simple_closure (scm_car (args), expr, true, start, end);
return pure;
}
- if (Simple_closure *sc = Simple_closure::unsmob (unpure))
+ if (Simple_closure *sc = unsmob<Simple_closure> (unpure))
{
SCM expr = sc->expression ();
return evaluate_with_simple_closure (scm_car (args), expr, true, start, end);