summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2014-02-08 16:13:54 +0100
committerAndy Wingo <wingo@pobox.com>2014-02-08 16:43:12 +0100
commit24cac6554073bb6e691605cd6ac6196f3c0851a3 (patch)
treeb4ae76a5491b9a6f15f7fd016913b29277f0130b
parent5cfeff11cc58148c58a85a879fd7a3e7cfbbe8e2 (diff)
downloadguile-24cac6554073bb6e691605cd6ac6196f3c0851a3.tar.gz
Deprecate the use of the vector interface on arrays
* libguile/vectors.c (scm_is_vector): Deprecate use on weak vectors and arrays. (scm_is_simple_vector): Deprecate use on weak vectors. (scm_vector_length, scm_c_vector_ref, scm_c_vector_set_x): Deprecate use on arrays. * libguile/sort.c: Adapt to check explicitly for arrays.
-rw-r--r--libguile/sort.c16
-rw-r--r--libguile/vectors.c49
2 files changed, 50 insertions, 15 deletions
diff --git a/libguile/sort.c b/libguile/sort.c
index 2a36320ec..998be8986 100644
--- a/libguile/sort.c
+++ b/libguile/sort.c
@@ -1,5 +1,5 @@
/* Copyright (C) 1999, 2000, 2001, 2002, 2004, 2006, 2007, 2008, 2009,
- * 2010, 2011, 2012 Free Software Foundation, Inc.
+ * 2010, 2011, 2012, 2014 Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -377,12 +377,13 @@ SCM_DEFINE (scm_sort_x, "sort!", 2, 0, 0,
SCM_VALIDATE_LIST_COPYLEN (1, items, len);
return scm_merge_list_step (&items, less, len);
}
- else if (scm_is_vector (items))
+ else if (scm_is_simple_vector (items)
+ || (scm_is_array (items) && scm_c_array_rank (items) == 1))
{
scm_restricted_vector_sort_x (items,
less,
scm_from_int (0),
- scm_vector_length (items));
+ scm_array_length (items));
return items;
}
else
@@ -403,7 +404,8 @@ SCM_DEFINE (scm_sort, "sort", 2, 0, 0,
if (scm_is_pair (items))
return scm_sort_x (scm_list_copy (items), less);
- else if (scm_is_vector (items))
+ else if (scm_is_simple_vector (items)
+ || (scm_is_array (items) && scm_c_array_rank (items) == 1))
return scm_sort_x (scm_vector_copy (items), less);
else
SCM_WRONG_TYPE_ARG (1, items);
@@ -489,7 +491,8 @@ SCM_DEFINE (scm_stable_sort_x, "stable-sort!", 2, 0, 0,
SCM_VALIDATE_LIST_COPYLEN (1, items, len);
return scm_merge_list_step (&items, less, len);
}
- else if (scm_is_vector (items))
+ else if (scm_is_simple_vector (items)
+ || (scm_is_array (items) && scm_c_array_rank (items) == 1))
{
scm_t_array_handle temp_handle, vec_handle;
SCM temp, *temp_elts, *vec_elts;
@@ -532,7 +535,8 @@ SCM_DEFINE (scm_stable_sort, "stable-sort", 2, 0, 0,
if (scm_is_pair (items))
return scm_stable_sort_x (scm_list_copy (items), less);
- else if (scm_is_vector (items))
+ else if (scm_is_simple_vector (items)
+ || (scm_is_array (items) && scm_c_array_rank (items) == 1))
return scm_stable_sort_x (scm_vector_copy (items), less);
else
SCM_WRONG_TYPE_ARG (1, items);
diff --git a/libguile/vectors.c b/libguile/vectors.c
index eec10aa6d..abcbfa0d1 100644
--- a/libguile/vectors.c
+++ b/libguile/vectors.c
@@ -47,12 +47,26 @@
int
scm_is_vector (SCM obj)
{
- if (SCM_I_IS_VECTOR (obj))
+ if (SCM_I_IS_NONWEAK_VECTOR (obj))
return 1;
- if (SCM_I_ARRAYP (obj) && SCM_I_ARRAY_NDIM (obj) == 1)
+ if (SCM_I_WVECTP (obj))
+ {
+ scm_c_issue_deprecation_warning
+ ("Expecting vector? to be true for weak vectors is deprecated. "
+ "Use weak-vector? instead.");
+ return 1;
+ }
+ if (SCM_I_ARRAYP (obj) && SCM_I_ARRAY_NDIM (obj) == 1)
{
SCM v = SCM_I_ARRAY_V (obj);
- return SCM_I_IS_VECTOR (v);
+ if (SCM_I_IS_VECTOR (v))
+ {
+ scm_c_issue_deprecation_warning
+ ("Expecting vector? to be true for rank-1 arrays is deprecated. "
+ "Use array?, array-rank, and array-type instead.");
+ return 1;
+ }
+ return 0;
}
return 0;
}
@@ -60,7 +74,16 @@ scm_is_vector (SCM obj)
int
scm_is_simple_vector (SCM obj)
{
- return SCM_I_IS_VECTOR (obj);
+ if (SCM_I_IS_NONWEAK_VECTOR (obj))
+ return 1;
+ if (SCM_I_WVECTP (obj))
+ {
+ scm_c_issue_deprecation_warning
+ ("Expecting scm_is_simple_vector to be true for weak vectors is "
+ "deprecated. Use scm_is_weak_vector instead.");
+ return 1;
+ }
+ return 0;
}
const SCM *
@@ -127,6 +150,9 @@ scm_vector_length (SCM v)
else if (SCM_I_ARRAYP (v) && SCM_I_ARRAY_NDIM (v) == 1)
{
scm_t_array_dim *dim = SCM_I_ARRAY_DIMS (v);
+ scm_c_issue_deprecation_warning
+ ("Using vector-length on arrays is deprecated. "
+ "Use array-length instead.");
return scm_from_size_t (dim->ubnd - dim->lbnd + 1);
}
else if (SCM_UNPACK (g_vector_length))
@@ -246,6 +272,10 @@ scm_c_vector_ref (SCM v, size_t k)
{
register SCM elt;
+ scm_c_issue_deprecation_warning
+ ("Using vector-ref on arrays is deprecated. "
+ "Use array-ref instead.");
+
if (k >= dim->ubnd - dim->lbnd + 1)
scm_out_of_range (NULL, scm_from_size_t (k));
k = SCM_I_ARRAY_BASE (v) + k*dim->inc;
@@ -320,6 +350,10 @@ scm_c_vector_set_x (SCM v, size_t k, SCM obj)
SCM vv = SCM_I_ARRAY_V (v);
if (SCM_I_IS_VECTOR (vv))
{
+ scm_c_issue_deprecation_warning
+ ("Using vector-set! on arrays is deprecated. "
+ "Use array-set! instead, but note the change in argument order.");
+
if (k >= dim->ubnd - dim->lbnd + 1)
scm_out_of_range (NULL, scm_from_size_t (k));
k = SCM_I_ARRAY_BASE (v) + k*dim->inc;
@@ -341,13 +375,10 @@ scm_c_vector_set_x (SCM v, size_t k, SCM obj)
{
scm_c_issue_deprecation_warning
("Using vector-set! as a primitive-generic is deprecated.");
- return scm_call_3 (g_vector_set_x, v, scm_from_size_t (k), obj);
+ scm_call_3 (g_vector_set_x, v, scm_from_size_t (k), obj);
}
else
- {
- scm_wrong_type_arg_msg ("vector-set!", 1, v, "vector");
- return SCM_UNDEFINED; /* not reached */
- }
+ scm_wrong_type_arg_msg ("vector-set!", 1, v, "vector");
}
SCM_DEFINE (scm_make_vector, "make-vector", 1, 1, 0,