X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgrob-property.cc;h=d7f29aed3db1e29b7d9ade31f27ed6178dad5f64;hb=7fb65fc23874860275fe337474edeb44166d45de;hp=bebd8dfbf6e4bc364585aa1190dfab5bf7628977;hpb=739ec1a40e28611c3a38f6cff6108bb7ce2db2fe;p=lilypond.git

diff --git a/lily/grob-property.cc b/lily/grob-property.cc
index bebd8dfbf6..d7f29aed3d 100644
--- a/lily/grob-property.cc
+++ b/lily/grob-property.cc
@@ -19,17 +19,34 @@
 #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;
 
 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 +54,31 @@ 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;
 }
+#endif
 
-
-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);
-
-
+#ifndef NDEBUG
   if (ly_is_procedure (modification_callback))
     scm_apply_0 (modification_callback,
 		 scm_list_n (self_scm (),
@@ -84,8 +86,22 @@ 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));
+#endif
+  
+  internal_set_property (sym, v);
 }
-#else
+
+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 +109,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)
@@ -148,9 +163,16 @@ Grob::internal_get_property (SCM sym) 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)
@@ -163,13 +185,6 @@ Grob::internal_get_property (SCM sym) const
   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)
 {      
@@ -182,7 +197,7 @@ 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;
@@ -213,7 +228,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;
 }
@@ -279,36 +305,3 @@ call_pure_function (SCM unpure, SCM args, int start, int end)
 		      scm_list_4 (unpure, args, scm_from_int (start), scm_from_int (end)));
 }
 
-
-/*
-  PROP_PATH should be big-to-small ordering
- */
-SCM 
-nested_property_alist (SCM alist, SCM prop_path, SCM value)
-{
-  SCM new_value = SCM_BOOL_F;
-  if (scm_is_pair (scm_cdr (prop_path)))
-    {
-      SCM sub_alist = ly_assoc_get (scm_car (prop_path), alist, SCM_EOL);
-      new_value = nested_property_alist (sub_alist, scm_cdr (prop_path), value);
-    }
-  else
-    {
-      new_value = value;
-    }
-  
-  return scm_acons (scm_car (prop_path), new_value, alist);
-}
-
-
-void
-set_nested_property (Grob *me, SCM big_to_small, SCM value)
-{
-  SCM alist = me->get_property (scm_car (big_to_small));
-
-  alist = nested_property_alist (alist, scm_cdr (big_to_small), value);
-  
-  me->set_property (scm_car (big_to_small),
-		    alist);
-}
-