X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgrob-property.cc;h=c4dce927b43f86f3265348779ede3ef846f6b1b9;hb=e776b399d99dba5ea76eae44b701eba2ea4ec977;hp=a6d57b4ce084dfb0463e5c2130aeac73a5adc265;hpb=e6caaa132f59006e5c47d0007b24bfedd07ad145;p=lilypond.git diff --git a/lily/grob-property.cc b/lily/grob-property.cc index a6d57b4ce0..c4dce927b4 100644 --- a/lily/grob-property.cc +++ b/lily/grob-property.cc @@ -3,7 +3,6 @@ */ #include -#include #include "main.hh" #include "input-smob.hh" @@ -15,6 +14,9 @@ #include "item.hh" #include "misc.hh" #include "item.hh" +#include "program-option.hh" +#include "profile.hh" +#include "simple-closure.hh" SCM Grob::get_property_alist_chain (SCM def) const @@ -25,40 +27,6 @@ Grob::get_property_alist_chain (SCM def) const SCM_UNDEFINED); } -/* - This special add_thing routine is slightly more efficient than - - set_prop (name, cons (thing, get_prop (name))) - - since it can reuse the handle returned by scm_assq (). -*/ -// JUNKME. -void -Grob::add_to_list_property (SCM sym, SCM thing) -{ - SCM handle - = scm_sloppy_assq (sym, mutable_property_alist_); - - if (handle != SCM_BOOL_F) - { - scm_set_cdr_x (handle, scm_cons (thing, scm_cdr (handle))); - } - else - { - /* - There is no mutable prop yet, so create an entry, and put it in front of the - mutable prop list. - */ - handle = scm_sloppy_assq (sym, immutable_property_alist_); - SCM tail = (handle != SCM_BOOL_F) ? scm_cdr (handle) : SCM_EOL; - SCM val = scm_cons (thing, tail); - - mutable_property_alist_ = scm_cons (scm_cons (sym, val), - mutable_property_alist_); - } -} - - extern void check_interfaces_for_property (Grob const *me, SCM sym); @@ -69,12 +37,12 @@ Grob::internal_set_property (SCM sym, SCM v) 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()); + scm_display (scm_list_2 (sym, type), scm_current_output_port ()); assert (0); } #endif @@ -85,7 +53,10 @@ Grob::internal_set_property (SCM sym, SCM v) if (do_internal_type_checking_global) { - if (!type_check_assignment (sym, v, ly_symbol2scm ("backend-type?"))) + if (!ly_is_procedure (v) + && !is_simple_closure (v) + && v != ly_symbol2scm ("calculation-in-progress") + && !type_check_assignment (sym, v, ly_symbol2scm ("backend-type?"))) abort (); check_interfaces_for_property (this, sym); } @@ -93,71 +64,102 @@ Grob::internal_set_property (SCM sym, SCM v) mutable_property_alist_ = scm_assq_set_x (mutable_property_alist_, sym, v); } -Protected_scm property_lookup_table; -LY_DEFINE(ly_property_lookup_stats, "ly:property-lookup-stats", - 0,0,0, (), - "") +//#define PROFILE_PROPERTY_ACCESSES +SCM +Grob::get_property_data (SCM sym) const { - return (SCM) property_lookup_table; -} +#ifndef NDEBUG + 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) + return scm_cdr (handle); + + handle = scm_sloppy_assq (sym, immutable_property_alist_); + + if (do_internal_type_checking_global && scm_is_pair (handle)) + { + SCM val = scm_cdr (handle); + if (!ly_is_procedure (val) + && !is_simple_closure (val) + && !type_check_assignment (sym, val, + ly_symbol2scm ("backend-type?"))) + abort (); + check_interfaces_for_property (this, sym); + } + + return (handle == SCM_BOOL_F) ? SCM_EOL : scm_cdr (handle); +} SCM Grob::internal_get_property (SCM sym) const { -#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) + SCM val = get_property_data (sym); + if (ly_is_procedure (val) + || is_simple_closure (val)) { - scm_display (scm_list_2 (sym, type), scm_current_output_port()); - assert (0); + val = ((Grob*)this)->try_callback (sym, val); } + + return val; +} + +#ifndef NDEBUG +#include "protected-scm.hh" + +Protected_scm grob_property_callback_stack = SCM_EOL; +bool debug_property_callbacks = 0; #endif -#if 0 +SCM +Grob::try_callback (SCM sym, SCM proc) +{ + SCM marker = ly_symbol2scm ("calculation-in-progress"); /* - Statistics: which properties are looked up? + need to put a value in SYM to ensure that we don't get a + cyclic call chain. */ - if (scm_hash_table_p (property_lookup_table) != SCM_BOOL_T) - { - property_lookup_table = scm_c_make_hash_table (259); - } + mutable_property_alist_ + = scm_assq_set_x (mutable_property_alist_, sym, marker); + +#ifndef NDEBUG + if (debug_property_callbacks) + grob_property_callback_stack = scm_acons (sym, proc, grob_property_callback_stack); +#endif - SCM hashhandle = scm_hashq_get_handle (property_lookup_table, sym); - if (hashhandle == SCM_BOOL_F) + SCM value = SCM_EOL; + if (ly_is_procedure (proc)) + value = scm_call_1 (proc, self_scm ()); + else if (is_simple_closure (proc)) { - scm_hashq_set_x (property_lookup_table, sym, scm_from_int (0)); - hashhandle = scm_hashq_get_handle (property_lookup_table, sym); + value = evaluate_with_simple_closure (self_scm (), + simple_closure_expression (proc)); } - - scm_set_cdr_x (hashhandle, scm_from_int (scm_to_int (scm_cdr (hashhandle)) + 1)); +#ifndef NDEBUG + if (debug_property_callbacks) + grob_property_callback_stack = scm_cdr (grob_property_callback_stack); #endif - - - SCM s = scm_sloppy_assq (sym, mutable_property_alist_); - if (s != SCM_BOOL_F) - return scm_cdr (s); - - s = scm_sloppy_assq (sym, immutable_property_alist_); - - if (do_internal_type_checking_global && scm_is_pair (s)) + + /* + If the function returns SCM_UNSPECIFIED, we assume the + property has been set with an explicit set_property() + call. + */ + if (value == SCM_UNSPECIFIED) { - if (!type_check_assignment (sym, scm_cdr (s), - ly_symbol2scm ("backend-type?"))) - abort (); - - check_interfaces_for_property (this, sym); + value = internal_get_property (sym); + if (value == marker) + mutable_property_alist_ = scm_assq_remove_x (mutable_property_alist_, marker); } - - return (s == SCM_BOOL_F) ? SCM_EOL : scm_cdr (s); + else + internal_set_property (sym, value); + + return value; } - - void Grob::internal_set_object (SCM s, SCM v) { @@ -168,23 +170,33 @@ Grob::internal_set_object (SCM s, SCM v) object_alist_ = scm_assq_set_x (object_alist_, s, v); } +void +Grob::del_property (SCM sym) +{ + mutable_property_alist_ = scm_assq_remove_x (mutable_property_alist_, sym); +} + 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) +bool +Grob::is_live () const { - set_break_subsititution (crit); - object_alist_ = substitute_object_alist (orig, object_alist_); + return immutable_property_alist_ != SCM_EOL; } + bool -Grob::is_live () const +Grob::internal_has_interface (SCM k) { - return immutable_property_alist_ != SCM_EOL; + return scm_c_memq (k, interfaces_) != SCM_BOOL_F; }