mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-04-30 20:00:19 +02:00
Code Activity

Deprecate using vector->list, vector-copy on arrays

Browse source 
* libguile/vectors.c (vector-copy, vector->list): As stated. Provide
  array free implementation for the supported case.
This commit is contained in:
Daniel Llorens 2021-08-05 12:33:34 +02:00
parent bc7bd22267
commit 81f12bf86e
1 changed files with 55 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

82
libguile/vectors.c
View file

@ -24,19 +24,20 @@
# include <config.h> # include <config.h>
#endif #endif
#include <string.h>
#include "array-handle.h" #include "array-handle.h"
#include "bdw-gc.h" #include "bdw-gc.h"
#include "boolean.h" #include "boolean.h"
#include "deprecation.h"
#include "eq.h" #include "eq.h"
#include "generalized-vectors.h"
#include "gsubr.h" #include "gsubr.h"
#include "list.h" #include "list.h"
#include "numbers.h" #include "numbers.h"
#include "pairs.h" #include "pairs.h"
#include "vectors.h" #include "vectors.h"
#include "generalized-vectors.h"
#define VECTOR_MAX_LENGTH (SCM_T_BITS_MAX >> 8) #define VECTOR_MAX_LENGTH (SCM_T_BITS_MAX >> 8)
@ -269,29 +270,41 @@ SCM_DEFINE (scm_vector_copy, "vector-copy", 1, 0, 0,
"Return a copy of @var{vec}.") "Return a copy of @var{vec}.")
#define FUNC_NAME s_scm_vector_copy #define FUNC_NAME s_scm_vector_copy
{ {
scm_t_array_handle handle; SCM result;
size_t i, len; if (SCM_I_IS_VECTOR (vec))
ssize_t inc; {
const SCM *src; size_t len = SCM_I_VECTOR_LENGTH (vec);
SCM result, *dst; result = make_vector (len);
memcpy (SCM_I_VECTOR_WELTS (result), SCM_I_VECTOR_ELTS (vec), len * sizeof(SCM));
}
else
{
scm_t_array_handle handle;
size_t i, len;
ssize_t inc;
const SCM *src;
SCM *dst;
src = scm_vector_elements (vec, &handle, &len, &inc); src = scm_vector_elements (vec, &handle, &len, &inc);
scm_c_issue_deprecation_warning
("Using vector-copy on arrays is deprecated. "
"Use array-copy instead.");
result = make_vector (len); 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;
scm_array_handle_release (&handle);
scm_array_handle_release (&handle);
}
return result; return result;
} }
#undef FUNC_NAME #undef FUNC_NAME
SCM_DEFINE (scm_vector_to_list, "vector->list", 1, 0, 0, SCM_DEFINE (scm_vector_to_list, "vector->list", 1, 0, 0,
(SCM v), (SCM vec),
"Return a newly allocated list composed of the elements of @var{v}.\n" "Return a newly allocated list composed of the elements of @var{vec}.\n"
"\n" "\n"
"@lisp\n" "@lisp\n"
"(vector->list '#(dah dah didah)) @result{} (dah dah didah)\n" "(vector->list '#(dah dah didah)) @result{} (dah dah didah)\n"
@ -300,18 +313,33 @@ SCM_DEFINE (scm_vector_to_list, "vector->list", 1, 0, 0,
#define FUNC_NAME s_scm_vector_to_list #define FUNC_NAME s_scm_vector_to_list
{ {
SCM res = SCM_EOL; SCM res = SCM_EOL;
const SCM *data;
scm_t_array_handle handle;
size_t i, count, len;
ssize_t inc;
data = scm_vector_elements (v, &handle, &len, &inc); if (SCM_I_IS_VECTOR (vec))
for (i = (len - 1) * inc, count = 0; {
count < len; ssize_t len = SCM_I_VECTOR_LENGTH (vec);
i -= inc, count++) const SCM * data = SCM_I_VECTOR_ELTS (vec);
res = scm_cons (data[i], res); for (ssize_t i = len-1; i >= 0; --i)
res = scm_cons (data[i], res);
}
else
{
const SCM *data;
scm_t_array_handle handle;
size_t i, count, len;
ssize_t inc;
scm_array_handle_release (&handle); data = scm_vector_elements (vec, &handle, &len, &inc);
scm_c_issue_deprecation_warning
("Using vector->list on arrays is deprecated. "
"Use array->list instead.");
for (i = (len - 1) * inc, count = 0;
count < len;
i -= inc, count++)
res = scm_cons (data[i], res);
scm_array_handle_release (&handle);
}
return res; return res;
} }
#undef FUNC_NAME #undef FUNC_NAME