From 594eb2bfac1040ecc6961c79442bea2a2cedec82 Mon Sep 17 00:00:00 2001 From: David Kastrup Date: Fri, 25 Sep 2015 16:29:14 +0200 Subject: [PATCH] Rewrite call_pure_function --- lily/grob-property.cc | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/lily/grob-property.cc b/lily/grob-property.cc index 260b6700c4..5842662757 100644 --- a/lily/grob-property.cc +++ b/lily/grob-property.cc @@ -314,24 +314,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)) + if (Unpure_pure_container *upc = unsmob (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; } -- 2.39.5