From 72bc777a01c0437d766bf50c3bb3913a8f3d4bdb Mon Sep 17 00:00:00 2001 From: David Kastrup Date: Sun, 5 Feb 2017 18:15:38 +0100 Subject: [PATCH] Issue 5057/2: Use Protected_scm::is_bound () with Scheme engravers --- lily/translator-ctors.cc | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lily/translator-ctors.cc b/lily/translator-ctors.cc index 7559bf30b4..af33d78a2f 100644 --- a/lily/translator-ctors.cc +++ b/lily/translator-ctors.cc @@ -67,8 +67,9 @@ LY_DEFINE (ly_translator_name, "ly:translator-name", "Return the type name of the translator definition @var{creator}." " The name is a symbol.") { - SCM res = SCM_UNBNDP (SCM (global_translator_dict_rev)) ? SCM_BOOL_F - : scm_hashq_ref (global_translator_dict_rev, creator, SCM_BOOL_F); + SCM res = global_translator_dict_rev.is_bound () + ? scm_hashq_ref (global_translator_dict_rev, creator, SCM_BOOL_F) + : SCM_BOOL_F; SCM_ASSERT_TYPE (scm_is_pair (res), creator, SCM_ARG1, __FUNCTION__, "translator definition"); return scm_car (res); @@ -78,8 +79,9 @@ LY_DEFINE (ly_translator_description, "ly:translator-description", 1, 0, 0, (SCM creator), "Return an alist of properties of translator definition @var{creator}.") { - SCM res = SCM_UNBNDP (SCM (global_translator_dict_rev)) ? SCM_BOOL_F - : scm_hashq_ref (global_translator_dict_rev, creator, SCM_BOOL_F); + SCM res = global_translator_dict_rev.is_bound () + ? scm_hashq_ref (global_translator_dict_rev, creator, SCM_BOOL_F) + : SCM_BOOL_F; SCM_ASSERT_TYPE (scm_is_pair (res), creator, SCM_ARG1, __FUNCTION__, "translator definition"); return scm_cdr (res); -- 2.39.2