mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-07-03 16:20:39 +02:00
Code Activity

vector-length rejects non vector? arg

Browse source 
* libguile/vectors.c
  - scm_c_vector_length:  error if SCM_I_IS_VECTOR (v) fails.
  - scm_vector_length: Documentation for vector-length.
This commit is contained in:
Daniel Llorens 2013-04-11 19:32:23 +02:00 • committed by Andy Wingo
parent fa156321d4
commit e1df3b3ea7
1 changed files with 15 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

32
libguile/vectors.c
View file

@ -100,31 +100,29 @@ SCM_DEFINE (scm_vector_p, "vector?", 1, 0, 0,
} }
#undef FUNC_NAME #undef FUNC_NAME
SCM_GPROC (s_vector_length, "vector-length", 1, 0, 0, scm_vector_length, g_vector_length);
/* Returns the number of elements in @var{vector} as an exact integer. */
SCM
scm_vector_length (SCM v)
{
if (SCM_I_IS_VECTOR (v))
return scm_from_size_t (SCM_I_VECTOR_LENGTH (v));
else if (SCM_I_ARRAYP (v) && SCM_I_ARRAY_NDIM (v) == 1)
{
scm_t_array_dim *dim = SCM_I_ARRAY_DIMS (v);
return scm_from_size_t (dim->ubnd - dim->lbnd + 1);
}
else
return scm_wta_dispatch_1 (g_vector_length, v, 1, "vector-length");
}
size_t size_t
scm_c_vector_length (SCM v) scm_c_vector_length (SCM v)
{ {
if (SCM_I_IS_VECTOR (v)) if (SCM_I_IS_VECTOR (v))
return SCM_I_VECTOR_LENGTH (v); return SCM_I_VECTOR_LENGTH (v);
else else
return scm_to_size_t (scm_vector_length (v)); scm_wrong_type_arg_msg (NULL, 0, v, "vector");
} }
SCM_DEFINE (scm_vector_length, "vector-length", 1, 0, 0,
(SCM v),
"Return the number of elements in vector @var{v} as an exact\n"
"integer.\n"
"\n"
"@lisp\n"
"(vector-length #(a b c)) @result{} 3\n"
"@end lisp")
#define FUNC_NAME s_scm_vector_length
{
return scm_from_size_t (scm_c_vector_length (v));
}
#undef FUNC_NAME
SCM_REGISTER_PROC (s_list_to_vector, "list->vector", 1, 0, 0, scm_vector); SCM_REGISTER_PROC (s_list_to_vector, "list->vector", 1, 0, 0, scm_vector);
/* /*
"Return a newly created vector initialized to the elements of" "Return a newly created vector initialized to the elements of"