summaryrefslogtreecommitdiff
path: root/libguile/objprop.c
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2011-10-24 17:22:47 +0200
committerAndy Wingo <wingo@pobox.com>2011-10-24 17:22:47 +0200
commit62fdadb0a5f10ff34c7e19ac299aa89d950ffc69 (patch)
tree9a8758a238a05db05aa6a9090c30ade2fbe0c514 /libguile/objprop.c
parent8c0e89ac9093aee52620bbdbec07936532f05f3d (diff)
downloadguile-62fdadb0a5f10ff34c7e19ac299aa89d950ffc69.tar.gz
check for pairs with scm_is_pair, not scm_nimp
* libguile/array-map.c (scm_ra_matchp, scm_ramapc): * libguile/dynwind.c (scm_swap_bindings): * libguile/hooks.c (hook_print, scm_c_run_hook, scm_c_run_hookn): * libguile/objprop.c (scm_object_property, scm_set_object_property_x): Use !scm_is_pair as the termination condition, not scm_imp.
Diffstat (limited to 'libguile/objprop.c')
-rw-r--r--libguile/objprop.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libguile/objprop.c b/libguile/objprop.c
index 3a57d2866..b45c9aa26 100644
--- a/libguile/objprop.c
+++ b/libguile/objprop.c
@@ -64,7 +64,7 @@ SCM_DEFINE (scm_object_property, "object-property", 2, 0, 0,
{
SCM assoc;
assoc = scm_assq (key, scm_object_properties (obj));
- return (SCM_NIMP (assoc) ? SCM_CDR (assoc) : SCM_BOOL_F);
+ return (scm_is_pair (assoc) ? SCM_CDR (assoc) : SCM_BOOL_F);
}
#undef FUNC_NAME
@@ -80,7 +80,7 @@ SCM_DEFINE (scm_set_object_property_x, "set-object-property!", 3, 0, 0,
scm_i_pthread_mutex_lock (&scm_i_misc_mutex);
alist = scm_weak_table_refq (object_whash, obj, SCM_EOL);
assoc = scm_assq (key, alist);
- if (SCM_NIMP (assoc))
+ if (scm_is_pair (assoc))
SCM_SETCDR (assoc, value);
else
scm_weak_table_putq_x (object_whash, obj, scm_acons (key, value, alist));