X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgrob-property.cc;h=e21ccf479d32e5f337cd37abd6a6fd0ed1771a47;hb=9d81de1232c3106d8a02b49ad4006f2ce9a4b82d;hp=f9773e5ec5a4878b12f66f1535970a5696e6ff8a;hpb=74e4d219b24ec6d6f28d663c0285418e6c8e122e;p=lilypond.git diff --git a/lily/grob-property.cc b/lily/grob-property.cc index f9773e5ec5..e21ccf479d 100644 --- a/lily/grob-property.cc +++ b/lily/grob-property.cc @@ -13,8 +13,6 @@ #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" @@ -22,11 +20,11 @@ #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 +34,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 +75,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; @@ -123,9 +121,9 @@ Grob::internal_set_value_on_alist (SCM *alist, SCM sym, SCM v) if (do_internal_type_checking_global) { if (!ly_is_procedure (v) - && !is_simple_closure (v) - && !is_unpure_pure_container (v) - && v != ly_symbol2scm ("calculation-in-progress")) + && !unsmob (v) + && !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 +135,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,13 +149,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) && !is_simple_closure (val) && !is_unpure_pure_container (val)) + if (!ly_is_procedure (val) && !unsmob (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 @@ -165,8 +164,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 (), @@ -179,11 +178,11 @@ Grob::internal_get_property (SCM sym) const } #endif - if (is_unpure_pure_container (val)) - val = unpure_pure_container_unpure_part (val); + if (Unpure_pure_container *upc = unsmob (val)) + val = upc->unpure_part (); if (ly_is_procedure (val) - || is_simple_closure (val)) + || unsmob (val)) { Grob *me = ((Grob *)this); val = me->try_callback_on_alist (&me->mutable_property_alist_, sym, val); @@ -197,11 +196,20 @@ SCM Grob::internal_get_pure_property (SCM sym, int start, int end) const { SCM val = internal_get_property_data (sym); - if (ly_is_procedure (val) || is_unpure_pure_container (val)) + if (ly_is_procedure (val)) return call_pure_function (val, scm_list_1 (self_scm ()), start, end); - if (is_simple_closure (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); + else + return call_pure_function (val, scm_list_1 (self_scm ()), start, end); + } + + if (Simple_closure *sc = unsmob (val)) return evaluate_with_simple_closure (self_scm (), - simple_closure_expression (val), + sc->expression (), true, start, end); return val; } @@ -222,7 +230,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 @@ -230,28 +238,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 (is_simple_closure (proc)) + else if (Simple_closure *sc = unsmob (proc)) { value = evaluate_with_simple_closure (self_scm (), - simple_closure_expression (proc), + 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 (), @@ -290,12 +298,12 @@ 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) - || is_simple_closure (val) - || is_unpure_pure_container (val)) + || unsmob (val) + || unsmob (val)) { Grob *me = ((Grob *)this); val = me->try_callback_on_alist (&me->object_alist_, sym, val); @@ -316,19 +324,19 @@ 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) { - if (is_unpure_pure_container (unpure)) + if (Unpure_pure_container *upc = unsmob (unpure)) { - SCM pure = unpure_pure_container_pure_part (unpure); + SCM pure = upc->pure_part (); - if (is_simple_closure (pure)) + if (Simple_closure *sc = unsmob (pure)) { - SCM expr = simple_closure_expression (pure); + SCM expr = sc->expression (); return evaluate_with_simple_closure (scm_car (args), expr, true, start, end); } @@ -342,9 +350,9 @@ call_pure_function (SCM unpure, SCM args, int start, int end) return pure; } - if (is_simple_closure (unpure)) + if (Simple_closure *sc = unsmob (unpure)) { - SCM expr = simple_closure_expression (unpure); + SCM expr = sc->expression (); return evaluate_with_simple_closure (scm_car (args), expr, true, start, end); }