X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgrob-property.cc;h=1129e481571672c1170c3a9e7da4e7ff30b24762;hb=5d84bfad4626892bcffd05adcced53c8a2329047;hp=260b6700c47d0ab0b45d14b362bfef645a0659ca;hpb=c5d9f09505f28e5b44c7070fd88a841a271b8028;p=lilypond.git

diff --git a/lily/grob-property.cc b/lily/grob-property.cc
index 260b6700c4..1129e48157 100644
--- a/lily/grob-property.cc
+++ b/lily/grob-property.cc
@@ -94,10 +94,9 @@ Grob::instrumented_set_property (SCM sym, SCM v,
 SCM
 Grob::get_property_alist_chain (SCM def) const
 {
-  return scm_list_n (mutable_property_alist_,
+  return scm_list_3 (mutable_property_alist_,
                      immutable_property_alist_,
-                     def,
-                     SCM_UNDEFINED);
+                     def);
 }
 
 extern void check_interfaces_for_property (Grob const *me, SCM sym);
@@ -248,12 +247,11 @@ Grob::try_callback_on_alist (SCM *alist, SCM sym, SCM proc)
     {
 #ifdef DEBUG
       if (ly_is_procedure (cache_callback))
-        scm_apply_0 (cache_callback,
-                     scm_list_n (self_scm (),
-                                 sym,
-                                 proc,
-                                 value,
-                                 SCM_UNDEFINED));
+        scm_call_4 (cache_callback,
+                    self_scm (),
+                    sym,
+                    proc,
+                    value);
 #endif
       internal_set_value_on_alist (alist, sym, value);
     }
@@ -314,24 +312,34 @@ Grob::internal_has_interface (SCM k)
 }
 
 SCM
-call_pure_function (SCM unpure, SCM args, int start, int end)
+call_pure_function (SCM value, SCM args, int start, int end)
 {
-  if (Unpure_pure_container *upc = unsmob<Unpure_pure_container> (unpure))
+  if (Unpure_pure_container *upc = unsmob<Unpure_pure_container> (value))
     {
-      SCM pure = upc->pure_part ();
+      if (upc->is_unchanging ())
+        {
+          // Don't bother forming an Unpure_pure_call here.
+          value = upc->unpure_part ();
+
+          if (ly_is_procedure (value))
+            return scm_apply_0 (value, args);
+          return value;
+        }
+
+      value = upc->pure_part ();
 
-      if (ly_is_procedure (pure))
-        return scm_apply_0 (pure,
-                            scm_append (scm_list_2 (scm_list_3 (scm_car (args),
-                                                                scm_from_int (start),
-                                                                scm_from_int (end)),
-                                                    scm_cdr (args))));
+      if (ly_is_procedure (value))
+        return scm_apply_3 (value,
+                            scm_car (args),
+                            scm_from_int (start),
+                            scm_from_int (end),
+                            scm_cdr (args));
 
-      return pure;
+      return value;
     }
 
-  if (!ly_is_procedure (unpure))
-    return unpure;
+  if (!ly_is_procedure (value))
+    return value;
 
   return SCM_BOOL_F;
 }