From 3dfd0a47e01374e0d8d1e6b127fa3f7a15a53edc Mon Sep 17 00:00:00 2001 From: =?utf8?q?Janek=20Warcho=C5=82?= Date: Thu, 21 Aug 2014 18:34:22 +0200 Subject: [PATCH] Replace internal_get_property with get_property where possible Note that thanks to lily-guile-macros magic, we can use get_property with both string and SCM input (see lily/include/lily-guile-macros.hh:48). --- lily/context-scheme.cc | 2 +- lily/context.cc | 2 +- lily/engraver-group.cc | 3 +-- lily/grob-scheme.cc | 2 +- lily/grob.cc | 19 +++++++------------ lily/piano-pedal-engraver.cc | 4 ++-- lily/prob-scheme.cc | 2 +- lily/scheme-engraver.cc | 2 +- lily/script-engraver.cc | 2 +- lily/self-alignment-interface.cc | 15 +++++++-------- lily/span-bar-engraver.cc | 7 +++---- lily/tuplet-bracket.cc | 2 +- 12 files changed, 27 insertions(+), 35 deletions(-) diff --git a/lily/context-scheme.cc b/lily/context-scheme.cc index c3822100af..8ff668eada 100644 --- a/lily/context-scheme.cc +++ b/lily/context-scheme.cc @@ -102,7 +102,7 @@ LY_DEFINE (ly_context_property, "ly:context-property", LY_ASSERT_TYPE (ly_is_symbol, sym, 2); Context *t = Context::unsmob (context); - SCM result = t->internal_get_property (sym); + SCM result = t->get_property (sym); return def != SCM_UNDEFINED && scm_is_null (result) ? def : result; } diff --git a/lily/context.cc b/lily/context.cc index 5aacffc4eb..8a85165cfd 100644 --- a/lily/context.cc +++ b/lily/context.cc @@ -817,7 +817,7 @@ melisma_busy (Context *tr) for (; !busy && scm_is_pair (melisma_properties); melisma_properties = scm_cdr (melisma_properties)) - busy = busy || to_boolean (tr->internal_get_property (scm_car (melisma_properties))); + busy = busy || to_boolean (tr->get_property (scm_car (melisma_properties))); return busy; } diff --git a/lily/engraver-group.cc b/lily/engraver-group.cc index a9048ccb9c..97e9277fcc 100644 --- a/lily/engraver-group.cc +++ b/lily/engraver-group.cc @@ -91,13 +91,12 @@ Engraver_group::acknowledge_grobs () return; SCM name_sym = ly_symbol2scm ("name"); - SCM meta_sym = ly_symbol2scm ("meta"); for (vsize j = 0; j < announce_infos_.size (); j++) { Grob_info info = announce_infos_[j]; - SCM meta = info.grob ()->internal_get_property (meta_sym); + SCM meta = info.grob ()->get_property ("meta"); SCM nm = scm_assoc (name_sym, meta); if (scm_is_pair (nm)) nm = scm_cdr (nm); diff --git a/lily/grob-scheme.cc b/lily/grob-scheme.cc index a3c102d187..065cc991d8 100644 --- a/lily/grob-scheme.cc +++ b/lily/grob-scheme.cc @@ -138,7 +138,7 @@ LY_DEFINE (ly_grob_property, "ly:grob-property", if (val == SCM_UNDEFINED) val = SCM_EOL; - SCM retval = sc->internal_get_property (sym); + SCM retval = sc->get_property (sym); if (retval == SCM_EOL) retval = val; diff --git a/lily/grob.cc b/lily/grob.cc index eeb219e244..63b7565035 100644 --- a/lily/grob.cc +++ b/lily/grob.cc @@ -403,7 +403,7 @@ Grob::get_offset (Axis a) const UGH: can't fold next 2 statements together. Apparently GCC thinks dim_cache_[a].offset_ is unaliased. */ - Real off = robust_scm2double (internal_get_property (sym), 0.0); + Real off = robust_scm2double (get_property (sym), 0.0); if (me->dim_cache_[a].offset_) { *me->dim_cache_[a].offset_ += off; @@ -458,20 +458,15 @@ Grob::extent (Grob *refp, Axis a) const /* Order is significant: ?-extent may trigger suicide. */ - SCM ext_sym - = (a == X_AXIS) - ? ly_symbol2scm ("X-extent") - : ly_symbol2scm ("Y-extent"); - - SCM ext = internal_get_property (ext_sym); + SCM ext = (a == X_AXIS) + ? get_property ("X-extent") + : get_property ("Y-extent"); if (is_number_pair (ext)) real_ext.unite (ly_scm2interval (ext)); - SCM min_ext_sym - = (a == X_AXIS) - ? ly_symbol2scm ("minimum-X-extent") - : ly_symbol2scm ("minimum-Y-extent"); - SCM min_ext = internal_get_property (min_ext_sym); + SCM min_ext = (a == X_AXIS) + ? get_property ("minimum-X-extent") + : get_property ("minimum-Y-extent"); if (is_number_pair (min_ext)) real_ext.unite (ly_scm2interval (min_ext)); diff --git a/lily/piano-pedal-engraver.cc b/lily/piano-pedal-engraver.cc index 250dfb458d..6699078cee 100644 --- a/lily/piano-pedal-engraver.cc +++ b/lily/piano-pedal-engraver.cc @@ -249,7 +249,7 @@ Piano_pedal_engraver::process_music () mixed: Ped. _____/\____| */ - SCM style = internal_get_property (p->type_->style_sym_); + SCM style = get_property (p->type_->style_sym_); bool mixed = style == ly_symbol2scm ("mixed"); bool bracket = (mixed @@ -269,7 +269,7 @@ void Piano_pedal_engraver::create_text_grobs (Pedal_info *p, bool mixed) { SCM s = SCM_EOL; - SCM strings = internal_get_property (p->type_->strings_sym_); + SCM strings = get_property (p->type_->strings_sym_); if (scm_ilength (strings) < 3) { diff --git a/lily/prob-scheme.cc b/lily/prob-scheme.cc index 73a5b303da..0dd8380ef2 100644 --- a/lily/prob-scheme.cc +++ b/lily/prob-scheme.cc @@ -54,7 +54,7 @@ LY_DEFINE (ly_prob_property, "ly:prob-property", if (val == SCM_UNDEFINED) val = SCM_EOL; - SCM retval = ps->internal_get_property (sym); + SCM retval = ps->get_property (sym); if (retval == SCM_EOL) return val; else diff --git a/lily/scheme-engraver.cc b/lily/scheme-engraver.cc index 0b69eb62e7..80a3310ba7 100644 --- a/lily/scheme-engraver.cc +++ b/lily/scheme-engraver.cc @@ -158,7 +158,7 @@ void Scheme_engraver::acknowledge_grob_by_hash (Grob_info info, SCM iface_function_hash) { - SCM meta = info.grob ()->internal_get_property (ly_symbol2scm ("meta")); + SCM meta = info.grob ()->get_property ("meta"); SCM ifaces = scm_cdr (scm_assoc (ly_symbol2scm ("interfaces"), meta)); for (SCM s = ifaces; scm_is_pair (s); s = scm_cdr (s)) { diff --git a/lily/script-engraver.cc b/lily/script-engraver.cc index 367739c374..d9783523e8 100644 --- a/lily/script-engraver.cc +++ b/lily/script-engraver.cc @@ -90,7 +90,7 @@ Script_engraver::listen_articulation (Stream_event *ev) void copy_property (Grob *g, SCM sym, SCM alist) { - if (g->internal_get_property (sym) == SCM_EOL) + if (g->get_property (sym) == SCM_EOL) { SCM entry = scm_assoc (sym, alist); if (scm_is_pair (entry)) diff --git a/lily/self-alignment-interface.cc b/lily/self-alignment-interface.cc index 6b6662641f..8e7bf9203b 100644 --- a/lily/self-alignment-interface.cc +++ b/lily/self-alignment-interface.cc @@ -49,10 +49,9 @@ Self_alignment_interface::pure_y_aligned_on_self (SCM smob, SCM start, SCM end) SCM Self_alignment_interface::aligned_on_self (Grob *me, Axis a, bool pure, int start, int end) { - SCM sym = (a == X_AXIS) ? ly_symbol2scm ("self-alignment-X") - : ly_symbol2scm ("self-alignment-Y"); - - SCM align (me->internal_get_property (sym)); + SCM align = (a == X_AXIS) + ? me->get_property ("self-alignment-X") + : me->get_property ("self-alignment-Y"); if (scm_is_number (align)) { Interval ext (me->maybe_pure_extent (me, a, pure, start, end)); @@ -123,12 +122,12 @@ Self_alignment_interface::aligned_on_parent (Grob *me, Axis a) } SCM self_align = (a == X_AXIS) - ? me->internal_get_property (ly_symbol2scm ("self-alignment-X")) - : me->internal_get_property (ly_symbol2scm ("self-alignment-Y")); + ? me->get_property ("self-alignment-X") + : me->get_property ("self-alignment-Y"); SCM par_align = (a == X_AXIS) - ? me->internal_get_property (ly_symbol2scm ("parent-alignment-X")) - : me->internal_get_property (ly_symbol2scm ("parent-alignment-Y")); + ? me->get_property ("parent-alignment-X") + : me->get_property ("parent-alignment-Y"); if (par_align == SCM_EOL) par_align = self_align; diff --git a/lily/span-bar-engraver.cc b/lily/span-bar-engraver.cc index 5e93de630a..a1420d532b 100644 --- a/lily/span-bar-engraver.cc +++ b/lily/span-bar-engraver.cc @@ -82,10 +82,9 @@ Span_bar_engraver::stop_translation_timestep () { if (spanbar_) { - SCM vissym = ly_symbol2scm ("break-visibility"); - SCM vis = bars_[0]->internal_get_property (vissym); - if (ly_is_equal (spanbar_->internal_get_property (vissym), vis)) - spanbar_->set_property (vissym, vis); + SCM vis = bars_[0]->get_property ("break-visibility"); + if (ly_is_equal (spanbar_->get_property ("break-visibility"), vis)) + spanbar_->set_property ("break-visibility", vis); scm_call_1 (ly_lily_module_constant ("span-bar::notify-grobs-of-my-existence"), spanbar_->self_scm ()); spanbar_ = 0; } diff --git a/lily/tuplet-bracket.cc b/lily/tuplet-bracket.cc index 3266780a3a..0eca57010c 100644 --- a/lily/tuplet-bracket.cc +++ b/lily/tuplet-bracket.cc @@ -77,7 +77,7 @@ flatten_number_pair_property (Grob *me, Direction xdir, SCM sym) { Drul_array zero (0, 0); Drul_array pair - = robust_scm2drul (me->internal_get_property (sym), zero); + = robust_scm2drul (me->get_property (sym), zero); pair[xdir] = 0.0; me->set_property (sym, ly_interval2scm (pair)); -- 2.39.2