From 3fba07976ac26b7e7def16679a7e7d1f92b2951c Mon Sep 17 00:00:00 2001 From: Daniel Llorens Date: Wed, 3 Apr 2013 15:40:48 +0200 Subject: [PATCH 1/5] Deprecate dead code in array-map.c * libguile/array-map.c, libguile/array-map.h: deprecate scm_ra_eqp, scm_ra_lessp, scm_ra_leqp, scm_ra_grp, scm_ra_greqp, scm_ra_sum, scm_ra_product, scm_ra_difference, scm_ra_divide, scm_array_identity. --- libguile/array-map.c | 5 +++-- libguile/array-map.h | 20 ++++++++++---------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/libguile/array-map.c b/libguile/array-map.c index 00a24f1..1dc5d3b 100644 --- a/libguile/array-map.c +++ b/libguile/array-map.c @@ -396,6 +396,7 @@ SCM_DEFINE (scm_array_copy_x, "array-copy!", 2, 0, 0, /* Functions callable by ARRAY-MAP! */ +#if SCM_ENABLE_DEPRECATED == 1 int scm_ra_eqp (SCM ra0, SCM ras) @@ -637,9 +638,9 @@ scm_array_identity (SCM dst, SCM src) return racp (SCM_CAR (src), scm_cons (dst, SCM_EOL)); } +#endif /* SCM_ENABLE_DEPRECATED */ - -static int +static int ramap (SCM ra0, SCM proc, SCM ras) { long i = SCM_I_ARRAY_DIMS (ra0)->lbnd; diff --git a/libguile/array-map.h b/libguile/array-map.h index 43d2a92..9785666 100644 --- a/libguile/array-map.h +++ b/libguile/array-map.h @@ -34,16 +34,16 @@ SCM_API int scm_ramapc (void *cproc, SCM data, SCM ra0, SCM lra, 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 int scm_ra_eqp (SCM ra0, SCM ras); -SCM_API int scm_ra_lessp (SCM ra0, SCM ras); -SCM_API int scm_ra_leqp (SCM ra0, SCM ras); -SCM_API int scm_ra_grp (SCM ra0, SCM ras); -SCM_API int scm_ra_greqp (SCM ra0, SCM ras); -SCM_API int scm_ra_sum (SCM ra0, SCM ras); -SCM_API int scm_ra_difference (SCM ra0, SCM ras); -SCM_API int scm_ra_product (SCM ra0, SCM ras); -SCM_API int scm_ra_divide (SCM ra0, SCM ras); -SCM_API int scm_array_identity (SCM src, SCM dst); +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); +SCM_DEPRECATED int scm_ra_grp (SCM ra0, SCM ras); +SCM_DEPRECATED int scm_ra_greqp (SCM ra0, SCM ras); +SCM_DEPRECATED int scm_ra_sum (SCM ra0, SCM ras); +SCM_DEPRECATED int scm_ra_difference (SCM ra0, SCM ras); +SCM_DEPRECATED int scm_ra_product (SCM ra0, SCM ras); +SCM_DEPRECATED int scm_ra_divide (SCM ra0, SCM ras); +SCM_DEPRECATED int scm_array_identity (SCM src, SCM dst); SCM_API SCM scm_array_map_x (SCM ra0, SCM proc, SCM lra); SCM_API SCM scm_array_for_each (SCM proc, SCM ra0, SCM lra); SCM_API SCM scm_array_index_map_x (SCM ra, SCM proc); -- 1.7.9.5