mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-16 16:50:21 +02:00
Code Activity

Deprecate scm_array_fill_int()

Browse source 
* libguile/array-map.h, libgule/array-map.c: move scm_array_fill_int
  to the deprecated section.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
Daniel Llorens 2013-04-03 22:52:21 +02:00 • committed by Ludovic Courtès
parent ab1ca17986
commit d09b201d59
3 changed files with 21 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

1
doc/guile-api.alist
View file

@ -1359,7 +1359,6 @@
(scm_array_copy_x (groups scm C) (scan-data T)) (scm_array_copy_x (groups scm C) (scan-data T))
(scm_array_dimensions (groups scm C) (scan-data T)) (scm_array_dimensions (groups scm C) (scan-data T))
(scm_array_equal_p (groups scm C) (scan-data T)) (scm_array_equal_p (groups scm C) (scan-data T))
(scm_array_fill_int (groups scm C) (scan-data T))
(scm_array_fill_x (groups scm C) (scan-data T)) (scm_array_fill_x (groups scm C) (scan-data T))
(scm_array_for_each (groups scm C) (scan-data T)) (scm_array_for_each (groups scm C) (scan-data T))
(scm_array_identity (groups scm C) (scan-data T)) (scm_array_identity (groups scm C) (scan-data T))

41
libguile/array-map.c
View file

@ -347,26 +347,6 @@ SCM_DEFINE (scm_array_fill_x, "array-fill!", 2, 0, 0,
} }
#undef FUNC_NAME #undef FUNC_NAME
/* to be used as cproc in scm_ramapc to fill an array dimension with
"fill". */
int
scm_array_fill_int (SCM ra, SCM fill, SCM ignore SCM_UNUSED)
#define FUNC_NAME s_scm_array_fill_x
{
unsigned long i;
unsigned long n = SCM_I_ARRAY_DIMS (ra)->ubnd - SCM_I_ARRAY_DIMS (ra)->lbnd + 1;
long inc = SCM_I_ARRAY_DIMS (ra)->inc;
unsigned long base = SCM_I_ARRAY_BASE (ra);
ra = SCM_I_ARRAY_V (ra);
for (i = base; n--; i += inc)
GVSET (ra, i, fill);
return 1;
}
#undef FUNC_NAME
static int static int
racp (SCM src, SCM dst) racp (SCM src, SCM dst)
@ -411,10 +391,29 @@ SCM_DEFINE (scm_array_copy_x, "array-copy!", 2, 0, 0,
} }
#undef FUNC_NAME #undef FUNC_NAME
/* Functions callable by ARRAY-MAP! */
#if SCM_ENABLE_DEPRECATED == 1 #if SCM_ENABLE_DEPRECATED == 1
/* to be used as cproc in scm_ramapc to fill an array dimension with
"fill". */
int
scm_array_fill_int (SCM ra, SCM fill, SCM ignore SCM_UNUSED)
{
unsigned long i;
unsigned long n = SCM_I_ARRAY_DIMS (ra)->ubnd - SCM_I_ARRAY_DIMS (ra)->lbnd + 1;
long inc = SCM_I_ARRAY_DIMS (ra)->inc;
unsigned long base = SCM_I_ARRAY_BASE (ra);
ra = SCM_I_ARRAY_V (ra);
for (i = base; n--; i += inc)
GVSET (ra, i, fill);
return 1;
}
/* Functions callable by ARRAY-MAP! */
int int
scm_ra_eqp (SCM ra0, SCM ras) scm_ra_eqp (SCM ra0, SCM ras)
{ {

2
libguile/array-map.h
View file

@ -31,7 +31,6 @@
SCM_API int scm_ra_matchp (SCM ra0, SCM ras); SCM_API int scm_ra_matchp (SCM ra0, SCM ras);
SCM_API int scm_ramapc (void *cproc, SCM data, SCM ra0, SCM lra, SCM_API int scm_ramapc (void *cproc, SCM data, SCM ra0, SCM lra,
const char *what); const char *what);
SCM_API int scm_array_fill_int (SCM ra, SCM fill, SCM ignore);
SCM_API SCM scm_array_fill_x (SCM ra, SCM fill); SCM_API SCM scm_array_fill_x (SCM ra, SCM fill);
SCM_API SCM scm_array_copy_x (SCM src, SCM dst); SCM_API SCM scm_array_copy_x (SCM src, SCM dst);
SCM_API SCM scm_array_map_x (SCM ra0, SCM proc, SCM lra); SCM_API SCM scm_array_map_x (SCM ra0, SCM proc, SCM lra);
@ -42,6 +41,7 @@ SCM_INTERNAL void scm_init_array_map (void);
#if SCM_ENABLE_DEPRECATED == 1 #if SCM_ENABLE_DEPRECATED == 1
SCM_DEPRECATED int scm_array_fill_int (SCM ra, SCM fill, SCM ignore);
SCM_DEPRECATED int scm_ra_eqp (SCM ra0, SCM ras); SCM_DEPRECATED int scm_ra_eqp (SCM ra0, SCM ras);
SCM_DEPRECATED int scm_ra_lessp (SCM ra0, SCM ras); SCM_DEPRECATED int scm_ra_lessp (SCM ra0, SCM ras);
SCM_DEPRECATED int scm_ra_leqp (SCM ra0, SCM ras); SCM_DEPRECATED int scm_ra_leqp (SCM ra0, SCM ras);