X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgrob-property.cc;h=55b06d6dfa2f522052b929b881bf2a974d7609c4;hb=e9135d834819eba63b64ec711542480250b42b78;hp=e8e74059ed3b6ca48c0a241b7aa8e566e5130640;hpb=711cf44d0ab28f3159230c84d63c0b19199408b0;p=lilypond.git

diff --git a/lily/grob-property.cc b/lily/grob-property.cc
index e8e74059ed..55b06d6dfa 100644
--- a/lily/grob-property.cc
+++ b/lily/grob-property.cc
@@ -19,60 +19,68 @@
 #include "profile.hh"
 #include "simple-closure.hh"
 #include "warn.hh"
+#include "protected-scm.hh"
+
+Protected_scm grob_property_callback_stack = SCM_EOL;
+
+extern bool debug_property_callbacks;
 
 #ifndef NDEBUG
+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 ()));
+}
+#endif
+
 static SCM modification_callback = SCM_EOL;
+static SCM cache_callback = SCM_EOL;
+
+
+/*
+
+FIXME: this should use ly:set-option interface instead.
+
+*/
 
 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 new value for the property.")
+	   "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 name of the function in which the modification was"
+	   " requested, the property to be changed, and the new value for"
+	   " the property.")
 {
-
-  SCM_ASSERT_TYPE(ly_is_procedure (cb), cb, SCM_ARG1, __FUNCTION__,
-		  "procedure");
-
-  modification_callback = cb;
+  modification_callback =  (ly_is_procedure (cb)) ? cb : SCM_BOOL_F;
   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);
+  cache_callback =  (ly_is_procedure (cb)) ? cb : SCM_BOOL_F;
+  return SCM_UNSPECIFIED;
 }
 
 
-extern void check_interfaces_for_property (Grob const *me, SCM sym);
-
-#ifndef NDEBUG
 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 (),
@@ -80,8 +88,26 @@ 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));
-}
 #else
+  (void) file;
+  (void) line;
+  (void) fun;
+#endif
+  
+  internal_set_property (sym, v);
+}
+
+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)
 {
@@ -89,7 +115,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)
@@ -102,9 +127,9 @@ Grob::internal_set_value_on_alist (SCM *alist, SCM sym, SCM v)
     {
       if (!ly_is_procedure (v)
 	  && !is_simple_closure (v)
-	  && v != ly_symbol2scm ("calculation-in-progress") 
-	  && !type_check_assignment (sym, v, ly_symbol2scm ("backend-type?")))
-	abort ();
+	  && v != ly_symbol2scm ("calculation-in-progress"))
+	type_check_assignment (sym, v, ly_symbol2scm ("backend-type?"));
+
       check_interfaces_for_property (this, sym);
     }
 
@@ -128,11 +153,8 @@ Grob::internal_get_property_data (SCM sym) const
   if (do_internal_type_checking_global && scm_is_pair (handle))
     {
       SCM val = scm_cdr (handle);
-      if (!ly_is_procedure (val)
-	  && !is_simple_closure (val)
-	  && !type_check_assignment (sym, val, 
-				  ly_symbol2scm ("backend-type?")))
-	abort ();
+      if (!ly_is_procedure (val) && !is_simple_closure (val))
+	type_check_assignment (sym, val, ly_symbol2scm ("backend-type?"));
 
       check_interfaces_for_property (this, sym);
     }
@@ -144,6 +166,21 @@ SCM
 Grob::internal_get_property (SCM sym) const
 {
   SCM val = get_property_data (sym);
+
+#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 ()));
+      if (debug_property_callbacks)
+	{
+	  message ("backtrace: ");
+	  print_property_callback_stack ();
+	}
+    }
+#endif
+  
   if (ly_is_procedure (val)
       || is_simple_closure (val))
     {
@@ -154,13 +191,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)
 {      
@@ -173,7 +203,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;
@@ -193,18 +223,29 @@ Grob::try_callback_on_alist (SCM *alist, SCM sym, SCM proc)
 	  
   /*
     If the function returns SCM_UNSPECIFIED, we assume the
-    property has been set with an explicit set_property()
+    property has been set with an explicit set_property ()
     call.
   */
   if (value == SCM_UNSPECIFIED)
     {
-      value = internal_get_property (sym);
+      value = get_property_data (sym);
       assert (value == SCM_EOL || value == marker);
       if (value == marker)
 	*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;
 }
@@ -269,3 +310,4 @@ call_pure_function (SCM unpure, SCM args, int start, int end)
   return scm_apply_0 (scm_call_pure_function,
 		      scm_list_4 (unpure, args, scm_from_int (start), scm_from_int (end)));
 }
+