diff options
author | Andy Wingo <wingo@pobox.com> | 2011-10-24 18:13:51 +0200 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2011-10-24 18:55:43 +0200 |
commit | 8c5bb72920a41d165726a1b5a610d823971f1ca8 (patch) | |
tree | ed9e8b3b2ff7d617557a6c5796f088b509e910ec /libguile/weak-vector.c | |
parent | fdecb44f3252e47ee98d95f3fe473ff898ddf27e (diff) | |
download | guile-8c5bb72920a41d165726a1b5a610d823971f1ca8.tar.gz |
add SCM_HEAP_OBJECT_P
* libguile/tags.h (SCM_HEAP_OBJECT_P): New macro, an alias for
SCM_NIMP.
* libguile/arrays.c:
* libguile/debug.c:
* libguile/foreign.c:
* libguile/gdbint.c:
* libguile/guardians.c:
* libguile/list.c:
* libguile/modules.c:
* libguile/options.c:
* libguile/smob.c:
* libguile/validate.h:
* libguile/weak-set.c:
* libguile/weak-table.c:
* libguile/weak-vector.c: Use it instead of SCM_NIMP or !SCM_IMP.
Diffstat (limited to 'libguile/weak-vector.c')
-rw-r--r-- | libguile/weak-vector.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libguile/weak-vector.c b/libguile/weak-vector.c index c76ec580a..23bc386d4 100644 --- a/libguile/weak-vector.c +++ b/libguile/weak-vector.c @@ -53,7 +53,7 @@ make_weak_vector (size_t len, SCM fill) SCM_SET_CELL_WORD_0 (wv, (len << 8) | scm_tc7_wvect); - if (SCM_NIMP (fill)) + if (SCM_HEAP_OBJECT_P (fill)) { memset (SCM_I_VECTOR_WELTS (wv), 0, len * sizeof (SCM)); for (j = 0; j < len; j++) @@ -170,12 +170,12 @@ scm_c_weak_vector_set_x (SCM wv, size_t k, SCM x) elts = SCM_I_VECTOR_WELTS (wv); - if (prev && SCM_NIMP (PTR2SCM (prev))) + if (prev && SCM_HEAP_OBJECT_P (SCM_PACK_POINTER (prev))) GC_unregister_disappearing_link ((GC_PTR) &elts[k]); elts[k] = x; - if (SCM_NIMP (x)) + if (SCM_HEAP_OBJECT_P (x)) SCM_I_REGISTER_DISAPPEARING_LINK ((GC_PTR) &elts[k], (GC_PTR) SCM2PTR (x)); } |