X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgrob-property.cc;h=bf1663e530e8527094dfc28b96af89bc3ea96cb5;hb=c98b4dc03abd0e96c0303f7e3b250c5f244a1208;hp=8c0350e83a195784d3bae495fa3437d4170f7351;hpb=164b2f76c9e387e18fff8e2a96960e5f434a8ffd;p=lilypond.git

diff --git a/lily/grob-property.cc b/lily/grob-property.cc
index 8c0350e83a..bf1663e530 100644
--- a/lily/grob-property.cc
+++ b/lily/grob-property.cc
@@ -1,52 +1,48 @@
 /*
   Implement storage and manipulation of grob properties.
- */
+*/
 
-#include <string.h>
+#include <cstring>
 #include <math.h>
 
 #include "main.hh"
 #include "input-smob.hh"
-#include "group-interface.hh"
+#include "pointer-group-interface.hh"
 #include "misc.hh"
 #include "paper-score.hh"
-#include "paper-def.hh"
-#include "grob.hh"
+#include "output-def.hh"
 #include "spanner.hh"
 #include "item.hh"
 #include "misc.hh"
 #include "item.hh"
-
+#include "program-option.hh"
+#include "profile.hh"
 
 SCM
 Grob::get_property_alist_chain (SCM def) const
 {
-  return  scm_list_n (mutable_property_alist_,
-		      immutable_property_alist_,
-		      def,
-		      SCM_UNDEFINED);
+  return scm_list_n (mutable_property_alist_,
+		     immutable_property_alist_,
+		     def,
+		     SCM_UNDEFINED);
 }
 
-
-
 /*
   This special add_thing routine is slightly more efficient than
 
-    set_prop (name,cons (thing, get_prop (name)))
+  set_prop (name, cons (thing, get_prop (name)))
 
-  since it can reuse the handle returned by scm_assq().
+  since it can reuse the handle returned by scm_assq ().
 */
+// JUNKME.
 void
-Grob::add_to_list_property (SCM sym, SCM thing) 
+Grob::add_to_list_property (SCM sym, SCM thing)
 {
   SCM handle
-    = scm_sloppy_assq (sym, mutable_property_alist_)
-    ;
+    = scm_sloppy_assq (sym, mutable_property_alist_);
 
   if (handle != SCM_BOOL_F)
-    {
-      gh_set_cdr_x (handle, gh_cons (thing, gh_cdr (handle)));
-    }
+    scm_set_cdr_x (handle, scm_cons (thing, scm_cdr (handle)));
   else
     {
       /*
@@ -54,66 +50,107 @@ Grob::add_to_list_property (SCM sym, SCM thing)
 	mutable prop list.
       */
       handle = scm_sloppy_assq (sym, immutable_property_alist_);
-      SCM tail = (handle != SCM_BOOL_F) ? gh_cdr(handle) : SCM_EOL;
-      SCM val = gh_cons (thing, tail);
+      SCM tail = (handle != SCM_BOOL_F) ? scm_cdr (handle) : SCM_EOL;
+      SCM val = scm_cons (thing, tail);
 
-      mutable_property_alist_ = gh_cons (gh_cons (sym, val),
-					 mutable_property_alist_);
+      mutable_property_alist_ = scm_cons (scm_cons (sym, val),
+					  mutable_property_alist_);
     }
 }
 
-
 extern void check_interfaces_for_property (Grob const *me, SCM sym);
 
 void
-Grob::internal_set_grob_property (SCM s, SCM v)
+Grob::internal_set_property (SCM sym, SCM v)
 {
+#ifndef NDEBUG
+  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);
+    }
+#endif
+
   /* Perhaps we simply do the assq_set, but what the heck. */
-  if (!live ())
+  if (!is_live ())
     return;
 
-  if (internal_type_checking_global_b)
+  if (do_internal_type_checking_global)
     {
-      if (!type_check_assignment (s, v, ly_symbol2scm ("backend-type?")))
+      if (!type_check_assignment (sym, v, ly_symbol2scm ("backend-type?")))
 	abort ();
-      check_interfaces_for_property (this, s);
+      check_interfaces_for_property (this, sym);
     }
 
-  mutable_property_alist_ = scm_assq_set_x (mutable_property_alist_, s, v);
+  mutable_property_alist_ = scm_assq_set_x (mutable_property_alist_, sym, v);
 }
 
+//#define PROFILE_PROPERTY_ACCESSES
+
 
 SCM
-Grob::internal_get_grob_property (SCM sym) const
+Grob::internal_get_property (SCM sym) const
 {
+#ifndef NDEBUG
+  if (profile_property_accesses)
+    note_property_access (&grob_property_lookup_table, sym);
+#endif
+
   SCM s = scm_sloppy_assq (sym, mutable_property_alist_);
   if (s != SCM_BOOL_F)
-    return ly_cdr (s);
+    return scm_cdr (s);
 
   s = scm_sloppy_assq (sym, immutable_property_alist_);
-  
-  if (internal_type_checking_global_b && gh_pair_p (s))
+
+  if (do_internal_type_checking_global && scm_is_pair (s))
     {
-      if (!type_check_assignment (sym, gh_cdr (s),
+      if (!type_check_assignment (sym, scm_cdr (s),
 				  ly_symbol2scm ("backend-type?")))
 	abort ();
 
       check_interfaces_for_property (this, sym);
     }
 
-  return (s == SCM_BOOL_F) ? SCM_EOL : ly_cdr (s); 
+  return (s == SCM_BOOL_F) ? SCM_EOL : scm_cdr (s);
 }
 
 void
-Grob::substitute_mutable_properties (SCM crit, SCM orig)
+Grob::internal_set_object (SCM s, SCM v)
 {
-  set_break_subsititution (crit);
-  mutable_property_alist_ = substitute_mutable_property_alist (orig);
+  /* Perhaps we simply do the assq_set, but what the heck. */
+  if (!is_live ())
+    return;
+
+  object_alist_ = scm_assq_set_x (object_alist_, s, v);
+}
+
+SCM
+Grob::internal_get_object (SCM sym) const
+{
+#ifdef PROFILE_PROPERTY_ACCESSES
+  note_property_access (&grob_property_lookup_table, sym);
+#endif
+
+  SCM s = scm_sloppy_assq (sym, object_alist_);
+
+  return (s == SCM_BOOL_F) ? SCM_EOL : scm_cdr (s);
 }
 
+void
+Grob::substitute_object_links (SCM crit, SCM orig)
+{
+  set_break_subsititution (crit);
+  object_alist_ = substitute_object_alist (orig, object_alist_);
+}
 
 bool
-Grob::live () const
+Grob::is_live () const
 {
   return immutable_property_alist_ != SCM_EOL;
 }