#include "profile.hh"
#include "simple-closure.hh"
#include "warn.hh"
+#include "protected-scm.hh"
+
+Protected_scm grob_property_callback_stack = SCM_EOL;
#ifndef NDEBUG
+extern bool debug_property_callbacks;
+
+static void
+print_property_callback_stack ()
+{
+ int frame = 0;
+ for (SCM s = grob_property_callback_stack; scm_is_pair (s); s = scm_cdr (s))
+ message (_f ("%d: %s", frame++, ly_scm_write_string (scm_car (s)).c_str ()));
+}
+
+
static SCM modification_callback = SCM_EOL;
static SCM cache_callback = SCM_EOL;
cache_callback = cb;
return SCM_UNSPECIFIED;
}
+#endif
void
Grob::instrumented_set_property (SCM sym, SCM v,
int line,
char const *fun)
{
+#ifndef NDEBUG
if (ly_is_procedure (modification_callback))
scm_apply_0 (modification_callback,
scm_list_n (self_scm (),
scm_from_int (line),
scm_from_locale_string (fun),
sym, v, SCM_UNDEFINED));
+#endif
+
internal_set_property (sym, v);
}
-#endif
SCM
Grob::get_property_alist_chain (SCM def) const
#ifndef NDEBUG
if (val == ly_symbol2scm ("calculation-in-progress"))
- programming_error (_f ("cyclic dependency: calculation-in-progress encountered for #'%s (%s)",
- ly_symbol2string (sym).c_str (),
- name ().c_str ()));
+ {
+ programming_error (_f ("cyclic dependency: calculation-in-progress encountered for #'%s (%s)",
+ ly_symbol2string (sym).c_str (),
+ name ().c_str ()));
+ if (debug_property_callbacks)
+ {
+ message ("backtrace: ");
+ print_property_callback_stack ();
+ }
+ }
#endif
if (ly_is_procedure (val)
return val;
}
-#ifndef NDEBUG
-#include "protected-scm.hh"
-
-Protected_scm grob_property_callback_stack = SCM_EOL;
-bool debug_property_callbacks = 0;
-#endif
-
SCM
Grob::try_callback_on_alist (SCM *alist, SCM sym, SCM proc)
{
#ifndef NDEBUG
if (debug_property_callbacks)
- grob_property_callback_stack = scm_acons (sym, proc, grob_property_callback_stack);
+ grob_property_callback_stack = scm_cons (scm_list_3 (self_scm (), sym, proc), grob_property_callback_stack);
#endif
SCM value = SCM_EOL;