Merge branch 'master' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond into jneeman

[lilypond.git] / lily / grob-property.cc

diff --git a/lily/grob-property.cc b/lily/grob-property.cc
index e7b59d954d6559d1babf22a0a0d173c0e1de8b38..084ea42fbdb60ede609beddcf35b61cf8889f876 100644 (file)
--- a/lily/grob-property.cc
+++ b/lily/grob-property.cc
@@ -22,14 +22,17 @@
 
 #ifndef NDEBUG
 static SCM modification_callback = SCM_EOL;
+static SCM cache_callback = SCM_EOL;
 
 LY_DEFINE (ly_set_grob_modification_callback, "ly:set-grob-modification-callback",
           1, 0, 0, (SCM cb),
           "Specify a procedure that will be called every time lilypond modifies "
           "a grob property. The callback will receive as arguments "
-          "the grob that is being modified, the name of the C++ file in which "
-          "the modification was requested, the line number in the C++ file in "
-          "which the modification was requested, the property to be changed and "
+          "the grob that is being modified, "
+          "the name of the C++ file in which the modification was requested, "
+          "the line number in the C++ file in which the modification was requested, "
+          "the name of the function in which the modification was requested, "
+          "the property to be changed and "
           "the new value for the property.")
 {
   LY_ASSERT_TYPE (ly_is_procedure, cb, 1);
@@ -37,46 +40,29 @@ LY_DEFINE (ly_set_grob_modification_callback, "ly:set-grob-modification-callback
   modification_callback = cb;
   return SCM_UNSPECIFIED;
 }
-#endif
 
-SCM
-Grob::get_property_alist_chain (SCM def) const
+LY_DEFINE (ly_set_property_cache_callback, "ly:set-property-cache-callback",
+          1, 0, 0, (SCM cb),
+          "Specify a procedure that will be called whenever lilypond calculates "
+          "a callback function and caches the result. The callback will "
+          "receive as arguments "
+          "the grob whose property it is, "
+          "the name of the property, "
+          "the name of the callback that calculated the property and "
+          "the new (cached) value of the property.")
 {
-  return scm_list_n (mutable_property_alist_,
-                    immutable_property_alist_,
-                    def,
-                    SCM_UNDEFINED);
+  LY_ASSERT_TYPE (ly_is_procedure, cb, 1);
+  
+  cache_callback = cb;
+  return SCM_UNSPECIFIED;
 }
 
-
-extern void check_interfaces_for_property (Grob const *me, SCM sym);
-
-#if 0
-
-/*
-  We can't change signatures depending on NDEBUG, since NDEBUG comes
-  over the command line and may be different per .cc file.  This
-  should be done through the macro expansion of get_property ().
- */
 void
-Grob::internal_set_property (SCM sym, SCM v, char const *file, int line, char const *fun)
+Grob::instrumented_set_property (SCM sym, SCM v,
+                                char const *file,
+                                int line,
+                                char const *fun)
 {
-  SCM grob_p = ly_lily_module_constant ("ly:grob?");
-  SCM grob_list_p = ly_lily_module_constant ("grob-list?");
-  SCM type = scm_object_property (sym, ly_symbol2scm ("backend-type?"));
-
-  if (type == grob_p
-      || type == grob_list_p
-      || (unsmob_grob (v) && ly_symbol2scm ("cause") != sym))
-    {
-      scm_display (scm_list_2 (sym, type), scm_current_output_port ());
-      assert (0);
-    }
-  
-  internal_set_value_on_alist (&mutable_property_alist_,
-                              sym, v);
-
-
   if (ly_is_procedure (modification_callback))
     scm_apply_0 (modification_callback,
                 scm_list_n (self_scm (),
@@ -84,8 +70,21 @@ Grob::internal_set_property (SCM sym, SCM v, char const *file, int line, char co
                             scm_from_int (line),
                             scm_from_locale_string (fun),
                             sym, v, SCM_UNDEFINED));
+  internal_set_property (sym, v);
 }
-#else
+#endif
+
+SCM
+Grob::get_property_alist_chain (SCM def) const
+{
+  return scm_list_n (mutable_property_alist_,
+                    immutable_property_alist_,
+                    def,
+                    SCM_UNDEFINED);
+}
+
+extern void check_interfaces_for_property (Grob const *me, SCM sym);
+
 void
 Grob::internal_set_property (SCM sym, SCM v)
 {
@@ -93,7 +92,6 @@ Grob::internal_set_property (SCM sym, SCM v)
                               sym, v);
 
 }
-#endif
 
 void
 Grob::internal_set_value_on_alist (SCM *alist, SCM sym, SCM v)
@@ -213,7 +211,18 @@ Grob::try_callback_on_alist (SCM *alist, SCM sym, SCM proc)
        *alist = scm_assq_remove_x (*alist, marker);
     }
   else
-    internal_set_value_on_alist (alist, sym, value);
+    {
+#ifndef NDEBUG
+      if (ly_is_procedure (cache_callback))
+       scm_apply_0 (cache_callback,
+                    scm_list_n (self_scm (),
+                                sym,
+                                proc,
+                                value,
+                                SCM_UNDEFINED));
+#endif
+      internal_set_value_on_alist (alist, sym, value);
+    }
   
   return value;
 }