mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-07-05 01:00:21 +02:00
Code Activity

vector-ref, vector-set! reject non vector? args

Browse source 
* libguile/vectors.c: (scm_c_vector_ref, scm_c_vector_set_x):
  throw type error if v is not vector?.
This commit is contained in:
Daniel Llorens 2013-04-11 18:28:19 +02:00 • committed by Andy Wingo
parent 70a63479ad
commit fa156321d4
1 changed files with 1 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

32
libguile/vectors.c
View file

@ -203,22 +203,6 @@ scm_c_vector_ref (SCM v, size_t k)
} }
else if (SCM_I_WVECTP (v)) else if (SCM_I_WVECTP (v))
return scm_c_weak_vector_ref (v, k); return scm_c_weak_vector_ref (v, k);
else if (SCM_I_ARRAYP (v) && SCM_I_ARRAY_NDIM (v) == 1)
{
scm_t_array_dim *dim = SCM_I_ARRAY_DIMS (v);
SCM vv = SCM_I_ARRAY_V (v);
k = SCM_I_ARRAY_BASE (v) + k*dim->inc;
if (k >= dim->ubnd - dim->lbnd + 1)
scm_out_of_range (NULL, scm_from_size_t (k));
if (SCM_I_IS_NONWEAK_VECTOR (vv))
return SCM_SIMPLE_VECTOR_REF (vv, k);
else if (SCM_I_WVECTP (vv))
return scm_c_weak_vector_ref (vv, k);
else
scm_wrong_type_arg_msg (NULL, 0, v, "non-uniform vector");
}
else else
return scm_wta_dispatch_2 (g_vector_ref, v, scm_from_size_t (k), 2, return scm_wta_dispatch_2 (g_vector_ref, v, scm_from_size_t (k), 2,
"vector-ref"); "vector-ref");
@ -257,22 +241,6 @@ scm_c_vector_set_x (SCM v, size_t k, SCM obj)
} }
else if (SCM_I_WVECTP (v)) else if (SCM_I_WVECTP (v))
scm_c_weak_vector_set_x (v, k, obj); scm_c_weak_vector_set_x (v, k, obj);
else if (SCM_I_ARRAYP (v) && SCM_I_ARRAY_NDIM (v) == 1)
{
scm_t_array_dim *dim = SCM_I_ARRAY_DIMS (v);
SCM vv = SCM_I_ARRAY_V (v);
k = SCM_I_ARRAY_BASE (v) + k*dim->inc;
if (k >= dim->ubnd - dim->lbnd + 1)
scm_out_of_range (NULL, scm_from_size_t (k));
if (SCM_I_IS_NONWEAK_VECTOR (vv))
SCM_SIMPLE_VECTOR_SET (vv, k, obj);
else if (SCM_I_WVECTP (vv))
scm_c_weak_vector_set_x (vv, k, obj);
else
scm_wrong_type_arg_msg (NULL, 0, v, "non-uniform vector");
}
else else
{ {
if (SCM_UNPACK (g_vector_set_x)) if (SCM_UNPACK (g_vector_set_x))