X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgrob-property.cc;h=c4dce927b43f86f3265348779ede3ef846f6b1b9;hb=e776b399d99dba5ea76eae44b701eba2ea4ec977;hp=04acbf4fc17e303f62d2fb2f1f9e2ec161b5ab1c;hpb=4ecdbd7d70ca7441be4dddd15ac01cc255bc2a35;p=lilypond.git

diff --git a/lily/grob-property.cc b/lily/grob-property.cc
index 04acbf4fc1..c4dce927b4 100644
--- a/lily/grob-property.cc
+++ b/lily/grob-property.cc
@@ -3,8 +3,6 @@
 */
 
 #include <cstring>
-#include <cmath>
-using namespace std;
 
 #include "main.hh"
 #include "input-smob.hh"
@@ -18,6 +16,7 @@ using namespace std;
 #include "item.hh"
 #include "program-option.hh"
 #include "profile.hh"
+#include "simple-closure.hh"
 
 SCM
 Grob::get_property_alist_chain (SCM def) const
@@ -28,36 +27,6 @@ Grob::get_property_alist_chain (SCM def) const
 		     SCM_UNDEFINED);
 }
 
-/*
-  This special add_thing routine is slightly more efficient than
-
-  set_prop (name, cons (thing, get_prop (name)))
-
-  since it can reuse the handle returned by scm_assq ().
-*/
-// JUNKME.
-void
-Grob::add_to_list_property (SCM sym, SCM thing)
-{
-  SCM handle
-    = scm_sloppy_assq (sym, mutable_property_alist_);
-
-  if (handle != SCM_BOOL_F)
-    scm_set_cdr_x (handle, scm_cons (thing, scm_cdr (handle)));
-  else
-    {
-      /*
-	There is no mutable prop yet, so create an entry, and put it in front of the
-	mutable prop list.
-      */
-      handle = scm_sloppy_assq (sym, immutable_property_alist_);
-      SCM tail = (handle != SCM_BOOL_F) ? scm_cdr (handle) : SCM_EOL;
-      SCM val = scm_cons (thing, tail);
-
-      mutable_property_alist_ = scm_cons (scm_cons (sym, val),
-					  mutable_property_alist_);
-    }
-}
 
 extern void check_interfaces_for_property (Grob const *me, SCM sym);
 
@@ -84,7 +53,10 @@ Grob::internal_set_property (SCM sym, SCM v)
 
   if (do_internal_type_checking_global)
     {
-      if (!type_check_assignment (sym, v, ly_symbol2scm ("backend-type?")))
+      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 ();
       check_interfaces_for_property (this, sym);
     }
@@ -93,32 +65,99 @@ Grob::internal_set_property (SCM sym, SCM v)
 }
 
 //#define PROFILE_PROPERTY_ACCESSES
-
-
 SCM
-Grob::internal_get_property (SCM sym) const
+Grob::get_property_data (SCM sym) const
 {
 #ifndef NDEBUG
   if (profile_property_accesses)
     note_property_access (&grob_property_lookup_table, sym);
 #endif
+  
+  SCM handle = scm_sloppy_assq (sym, mutable_property_alist_);
+  if (handle != SCM_BOOL_F)
+    return scm_cdr (handle);
 
-  SCM s = scm_sloppy_assq (sym, mutable_property_alist_);
-  if (s != SCM_BOOL_F)
-    return scm_cdr (s);
-
-  s = scm_sloppy_assq (sym, immutable_property_alist_);
+  handle = scm_sloppy_assq (sym, immutable_property_alist_);
 
-  if (do_internal_type_checking_global && scm_is_pair (s))
+  if (do_internal_type_checking_global && scm_is_pair (handle))
     {
-      if (!type_check_assignment (sym, scm_cdr (s),
+      SCM val = scm_cdr (handle);
+      if (!ly_is_procedure (val)
+	  && !is_simple_closure (val)
+	  && !type_check_assignment (sym, val, 
 				  ly_symbol2scm ("backend-type?")))
 	abort ();
 
       check_interfaces_for_property (this, sym);
     }
+  
+  return (handle == SCM_BOOL_F) ? SCM_EOL : scm_cdr (handle);
+}
 
-  return (s == SCM_BOOL_F) ? SCM_EOL : scm_cdr (s);
+SCM
+Grob::internal_get_property (SCM sym) const
+{
+  SCM val = get_property_data (sym);
+  if (ly_is_procedure (val)
+      || is_simple_closure (val))
+    {
+      val = ((Grob*)this)->try_callback (sym, 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 (SCM sym, SCM proc)
+{      
+  SCM marker = ly_symbol2scm ("calculation-in-progress");
+  /*
+    need to put a value in SYM to ensure that we don't get a
+    cyclic call chain.
+  */
+  mutable_property_alist_
+    = scm_assq_set_x (mutable_property_alist_, sym, marker);
+
+#ifndef NDEBUG
+  if (debug_property_callbacks)
+    grob_property_callback_stack = scm_acons (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 (is_simple_closure (proc))
+    {
+      value = evaluate_with_simple_closure (self_scm (),
+					    simple_closure_expression (proc));
+    }
+#ifndef NDEBUG
+  if (debug_property_callbacks)
+    grob_property_callback_stack = scm_cdr (grob_property_callback_stack);
+#endif
+	  
+  /*
+    If the function returns SCM_UNSPECIFIED, we assume the
+    property has been set with an explicit set_property()
+    call.
+  */
+  if (value == SCM_UNSPECIFIED)
+    {
+      value = internal_get_property (sym);
+      if (value == marker)
+	mutable_property_alist_ = scm_assq_remove_x (mutable_property_alist_, marker);
+    }
+  else
+    internal_set_property (sym, value);
+	  
+  return value;
 }
 
 void
@@ -131,6 +170,12 @@ Grob::internal_set_object (SCM s, SCM v)
   object_alist_ = scm_assq_set_x (object_alist_, s, v);
 }
 
+void
+Grob::del_property (SCM sym)
+{
+  mutable_property_alist_ = scm_assq_remove_x (mutable_property_alist_, sym);
+}
+
 SCM
 Grob::internal_get_object (SCM sym) const
 {
@@ -143,15 +188,15 @@ Grob::internal_get_object (SCM sym) const
   return (s == SCM_BOOL_F) ? SCM_EOL : scm_cdr (s);
 }
 
-void
-Grob::substitute_object_links (SCM crit, SCM orig)
+bool
+Grob::is_live () const
 {
-  set_break_subsititution (crit);
-  object_alist_ = substitute_object_alist (orig, object_alist_);
+  return immutable_property_alist_ != SCM_EOL;
 }
 
+
 bool
-Grob::is_live () const
+Grob::internal_has_interface (SCM k)
 {
-  return immutable_property_alist_ != SCM_EOL;
+  return scm_c_memq (k, interfaces_) != SCM_BOOL_F;
 }