mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-20 11:40:18 +02:00
Code Activity

Avoid double initialization in 'vector-copy'.

Browse source 
* libguile/vectors.c (make_vector): New function.
(scm_c_make_vector): Use it instead of 'scm_words'.
(scm_vector_copy): Use it instead of 'scm_c_make_vector'.
This commit is contained in:
Ludovic Courtès 2020-03-23 11:33:03 +01:00
parent ef6f7ce70b
commit 168ad279e6
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
libguile/vectors.c
View file

@ -1,4 +1,4 @@
/* Copyright 1995-1996,1998-2001,2006,2008-2012,2014,2018-2019 /* Copyright 1995-1996,1998-2001,2006,2008-2012,2014,2018-2020
Free Software Foundation, Inc. Free Software Foundation, Inc.
This file is part of Guile. This file is part of Guile.
@ -241,6 +241,11 @@ SCM_DEFINE (scm_make_vector, "make-vector", 1, 1, 0,
} }
#undef FUNC_NAME #undef FUNC_NAME
static SCM
make_vector (size_t size)
{
return scm_words ((size << 8) | scm_tc7_vector, size + 1);
}
SCM SCM
scm_c_make_vector (size_t k, SCM fill) scm_c_make_vector (size_t k, SCM fill)
@ -251,8 +256,7 @@ scm_c_make_vector (size_t k, SCM fill)
SCM_ASSERT_RANGE (1, scm_from_size_t (k), k <= VECTOR_MAX_LENGTH); SCM_ASSERT_RANGE (1, scm_from_size_t (k), k <= VECTOR_MAX_LENGTH);
vector = scm_words ((k << 8) | scm_tc7_vector, k + 1); vector = make_vector (k);
for (j = 0; j < k; ++j) for (j = 0; j < k; ++j)
SCM_SIMPLE_VECTOR_SET (vector, j, fill); SCM_SIMPLE_VECTOR_SET (vector, j, fill);
@ -273,7 +277,7 @@ SCM_DEFINE (scm_vector_copy, "vector-copy", 1, 0, 0,
src = scm_vector_elements (vec, &handle, &len, &inc); src = scm_vector_elements (vec, &handle, &len, &inc);
result = scm_c_make_vector (len, SCM_UNDEFINED); result = make_vector (len);
dst = SCM_I_VECTOR_WELTS (result); dst = SCM_I_VECTOR_WELTS (result);
for (i = 0; i < len; i++, src += inc) for (i = 0; i < len; i++, src += inc)
dst[i] = *src; dst[i] = *src;