diff options
author | Ludovic Courtes <ludovic.courtes@laas.fr> | 2006-05-02 21:30:37 +0000 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2008-09-05 00:48:01 +0200 |
commit | d525e4f9a21d1c483bc23fb047cb35edae2997ae (patch) | |
tree | 0a9b347b13ad55a82c8694c6c1ec291ae7c20752 /libguile/weaks.c | |
parent | 4650cdd20dd8b4931bed910e299e766f391546aa (diff) | |
download | guile-d525e4f9a21d1c483bc23fb047cb35edae2997ae.tar.gz |
Fixed `list->weak-vector'.
* libguile/vectors.c (scm_i_allocate_weak_vector): Removed.
(MAKE_WEAK_VECTOR): New macro.
(allocate_weak_vector): New.
(scm_i_make_weak_vector): New.
(scm_i_make_weak_vector_from_list): New.
* libguile/vectors.h: Updated.
* libguile/weaks.c (scm_make_weak_vector): Use `scm_i_make_weak_vector ()'.
(scm_weak_vector): Use `scm_i_make_weak_vector_from_list ()'.
git-archimport-id: lcourtes@laas.fr--2005-libre/guile-core--boehm-gc--1.9--patch-13
Diffstat (limited to 'libguile/weaks.c')
-rw-r--r-- | libguile/weaks.c | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/libguile/weaks.c b/libguile/weaks.c index 6f22f629a..4a0f3bcd7 100644 --- a/libguile/weaks.c +++ b/libguile/weaks.c @@ -76,7 +76,7 @@ SCM_DEFINE (scm_make_weak_vector, "make-weak-vector", 1, 1, 0, "empty list.") #define FUNC_NAME s_scm_make_weak_vector { - return scm_i_allocate_weak_vector (0, size, fill); + return scm_i_make_weak_vector (0, size, fill); } #undef FUNC_NAME @@ -92,26 +92,7 @@ SCM_DEFINE (scm_weak_vector, "weak-vector", 0, 0, 1, "the same way @code{list->vector} would.") #define FUNC_NAME s_scm_weak_vector { - scm_t_array_handle handle; - SCM res, *data; - long i; - - i = scm_ilength (l); - SCM_ASSERT (i >= 0, l, SCM_ARG1, FUNC_NAME); - - res = scm_make_weak_vector (scm_from_int (i), SCM_UNSPECIFIED); - data = scm_vector_writable_elements (res, &handle, NULL, NULL); - - while (scm_is_pair (l) && i > 0) - { - *data++ = SCM_CAR (l); - l = SCM_CDR (l); - i--; - } - - scm_array_handle_release (&handle); - - return res; + return scm_i_make_weak_vector_from_list (0, l); } #undef FUNC_NAME |