diff options
-rw-r--r-- | doc/guile-api.alist | 1 | ||||
-rw-r--r-- | libguile/array-map.c | 41 | ||||
-rw-r--r-- | libguile/array-map.h | 2 |
3 files changed, 21 insertions, 23 deletions
diff --git a/doc/guile-api.alist b/doc/guile-api.alist index 5830c917a..78d3a5cd0 100644 --- a/doc/guile-api.alist +++ b/doc/guile-api.alist @@ -1359,7 +1359,6 @@ (scm_array_copy_x (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_fill_int (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_identity (groups scm C) (scan-data T)) diff --git a/libguile/array-map.c b/libguile/array-map.c index c86ea8457..2779458e9 100644 --- a/libguile/array-map.c +++ b/libguile/array-map.c @@ -347,26 +347,6 @@ SCM_DEFINE (scm_array_fill_x, "array-fill!", 2, 0, 0, } #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 racp (SCM src, SCM dst) @@ -411,10 +391,29 @@ SCM_DEFINE (scm_array_copy_x, "array-copy!", 2, 0, 0, } #undef FUNC_NAME -/* Functions callable by ARRAY-MAP! */ #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 scm_ra_eqp (SCM ra0, SCM ras) { diff --git a/libguile/array-map.h b/libguile/array-map.h index eb1aa375f..b0592d818 100644 --- a/libguile/array-map.h +++ b/libguile/array-map.h @@ -31,7 +31,6 @@ SCM_API int scm_ra_matchp (SCM ra0, SCM ras); SCM_API int scm_ramapc (void *cproc, SCM data, SCM ra0, SCM lra, 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_copy_x (SCM src, SCM dst); 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 +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_lessp (SCM ra0, SCM ras); SCM_DEPRECATED int scm_ra_leqp (SCM ra0, SCM ras); |