X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgrob-property.cc;h=1129e481571672c1170c3a9e7da4e7ff30b24762;hb=b872748c6aa8bb721ced458691b38ac2fac5dfc8;hp=779f0e91cbcb4712deb96e765e5f4db4f8c4c506;hpb=0fe24db3936774a8fb913cb14c997036db7aeb1c;p=lilypond.git diff --git a/lily/grob-property.cc b/lily/grob-property.cc index 779f0e91cb..1129e48157 100644 --- a/lily/grob-property.cc +++ b/lily/grob-property.cc @@ -13,20 +13,17 @@ #include "spanner.hh" #include "international.hh" #include "item.hh" -#include "misc.hh" -#include "item.hh" #include "program-option.hh" #include "profile.hh" -#include "simple-closure.hh" #include "unpure-pure-container.hh" #include "warn.hh" #include "protected-scm.hh" -Protected_scm grob_property_callback_stack = SCM_EOL; +Protected_scm grob_property_callback_stack (SCM_EOL); extern bool debug_property_callbacks; -#ifndef NDEBUG +#ifdef DEBUG static void print_property_callback_stack () { @@ -36,8 +33,8 @@ print_property_callback_stack () } #endif -static Protected_scm modification_callback = SCM_EOL; -static Protected_scm cache_callback = SCM_EOL; +static Protected_scm modification_callback (SCM_EOL); +static Protected_scm cache_callback (SCM_EOL); /* FIXME: this should use ly:set-option interface instead. @@ -77,13 +74,13 @@ Grob::instrumented_set_property (SCM sym, SCM v, int line, char const *fun) { -#ifndef NDEBUG +#ifdef DEBUG if (ly_is_procedure (modification_callback)) scm_apply_0 (modification_callback, scm_list_n (self_scm (), scm_from_locale_string (file), scm_from_int (line), - scm_from_locale_string (fun), + scm_from_ascii_string (fun), sym, v, SCM_UNDEFINED)); #else (void) file; @@ -97,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); @@ -123,9 +119,8 @@ Grob::internal_set_value_on_alist (SCM *alist, SCM sym, SCM v) if (do_internal_type_checking_global) { if (!ly_is_procedure (v) - && !Simple_closure::is_smob (v) - && !Unpure_pure_container::is_smob (v) - && v != ly_symbol2scm ("calculation-in-progress")) + && !unsmob (v) + && !scm_is_eq (v, ly_symbol2scm ("calculation-in-progress"))) type_check_assignment (sym, v, ly_symbol2scm ("backend-type?")); check_interfaces_for_property (this, sym); @@ -137,13 +132,13 @@ Grob::internal_set_value_on_alist (SCM *alist, SCM sym, SCM v) SCM Grob::internal_get_property_data (SCM sym) const { -#ifndef NDEBUG +#ifdef DEBUG 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) + if (scm_is_true (handle)) return scm_cdr (handle); handle = scm_sloppy_assq (sym, immutable_property_alist_); @@ -151,14 +146,14 @@ 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) && !Simple_closure::is_smob (val) - && !Unpure_pure_container::is_smob (val)) + if (!ly_is_procedure (val) + && !unsmob (val)) type_check_assignment (sym, val, ly_symbol2scm ("backend-type?")); check_interfaces_for_property (this, sym); } - return (handle == SCM_BOOL_F) ? SCM_EOL : scm_cdr (handle); + return scm_is_false (handle) ? SCM_EOL : scm_cdr (handle); } SCM @@ -166,8 +161,8 @@ Grob::internal_get_property (SCM sym) const { SCM val = get_property_data (sym); -#ifndef NDEBUG - if (val == ly_symbol2scm ("calculation-in-progress")) +#ifdef DEBUG + if (scm_is_eq (val, ly_symbol2scm ("calculation-in-progress"))) { programming_error (to_string ("cyclic dependency: calculation-in-progress encountered for #'%s (%s)", ly_symbol2string (sym).c_str (), @@ -180,11 +175,10 @@ Grob::internal_get_property (SCM sym) const } #endif - if (Unpure_pure_container *upc = Unpure_pure_container::unsmob (val)) + if (Unpure_pure_container *upc = unsmob (val)) val = upc->unpure_part (); - if (ly_is_procedure (val) - || Simple_closure::is_smob (val)) + if (ly_is_procedure (val)) { Grob *me = ((Grob *)this); val = me->try_callback_on_alist (&me->mutable_property_alist_, sym, val); @@ -201,7 +195,7 @@ Grob::internal_get_pure_property (SCM sym, int start, int end) const if (ly_is_procedure (val)) return call_pure_function (val, scm_list_1 (self_scm ()), start, end); - if (Unpure_pure_container *upc = Unpure_pure_container::unsmob (val)) { + if (Unpure_pure_container *upc = unsmob (val)) { // Do cache, if the function ignores 'start' and 'end' if (upc->is_unchanging ()) return internal_get_property (sym); @@ -209,10 +203,6 @@ Grob::internal_get_pure_property (SCM sym, int start, int end) const return call_pure_function (val, scm_list_1 (self_scm ()), start, end); } - if (Simple_closure *sc = Simple_closure::unsmob (val)) - return evaluate_with_simple_closure (self_scm (), - sc->expression (), - true, start, end); return val; } @@ -232,7 +222,7 @@ Grob::try_callback_on_alist (SCM *alist, SCM sym, SCM proc) */ *alist = scm_assq_set_x (*alist, sym, marker); -#ifndef NDEBUG +#ifdef DEBUG if (debug_property_callbacks) grob_property_callback_stack = scm_cons (scm_list_3 (self_scm (), sym, proc), grob_property_callback_stack); #endif @@ -240,35 +230,28 @@ Grob::try_callback_on_alist (SCM *alist, SCM sym, SCM proc) SCM value = SCM_EOL; if (ly_is_procedure (proc)) value = scm_call_1 (proc, self_scm ()); - else if (Simple_closure *sc = Simple_closure::unsmob (proc)) - { - value = evaluate_with_simple_closure (self_scm (), - sc->expression (), - false, 0, 0); - } -#ifndef NDEBUG +#ifdef DEBUG if (debug_property_callbacks) grob_property_callback_stack = scm_cdr (grob_property_callback_stack); #endif - if (value == SCM_UNSPECIFIED) + if (scm_is_eq (value, SCM_UNSPECIFIED)) { value = get_property_data (sym); - assert (value == SCM_EOL || value == marker); - if (value == marker) + assert (scm_is_null (value) || scm_is_eq (value, marker)); + if (scm_is_eq (value, marker)) *alist = scm_assq_remove_x (*alist, sym); } else { -#ifndef NDEBUG +#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); } @@ -300,12 +283,11 @@ Grob::internal_get_object (SCM sym) const SCM s = scm_sloppy_assq (sym, object_alist_); - if (s != SCM_BOOL_F) + if (scm_is_true (s)) { SCM val = scm_cdr (s); if (ly_is_procedure (val) - || Simple_closure::is_smob (val) - || Unpure_pure_container::is_smob (val)) + || unsmob (val)) { Grob *me = ((Grob *)this); val = me->try_callback_on_alist (&me->object_alist_, sym, val); @@ -326,41 +308,38 @@ Grob::is_live () const bool Grob::internal_has_interface (SCM k) { - return scm_c_memq (k, interfaces_) != SCM_BOOL_F; + return scm_is_true (scm_c_memq (k, interfaces_)); } 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 = Unpure_pure_container::unsmob (unpure)) + if (Unpure_pure_container *upc = unsmob (value)) { - SCM pure = upc->pure_part (); - - if (Simple_closure *sc = Simple_closure::unsmob (pure)) + if (upc->is_unchanging ()) { - SCM expr = sc->expression (); - return evaluate_with_simple_closure (scm_car (args), expr, true, start, end); + // 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; } - 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)))); + value = upc->pure_part (); - return pure; - } + if (ly_is_procedure (value)) + return scm_apply_3 (value, + scm_car (args), + scm_from_int (start), + scm_from_int (end), + scm_cdr (args)); - if (Simple_closure *sc = Simple_closure::unsmob (unpure)) - { - SCM expr = sc->expression (); - return evaluate_with_simple_closure (scm_car (args), expr, true, start, end); + return value; } - if (!ly_is_procedure (unpure)) - return unpure; + if (!ly_is_procedure (value)) + return value; return SCM_BOOL_F; } -