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

* Deprecated SCM_LENGTH_MAX.

Browse source
This commit is contained in:
Dirk Herrmann 2000-11-23 15:26:24 +00:00
parent 6a0476fd11
commit 5b9eb8ae16
6 changed files with 32 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

18
libguile/unif.c
View file

@ -158,13 +158,12 @@ scm_make_uve (long k, SCM prot)
SCM v;
long i, type;
SCM_ASSERT_RANGE (1, scm_long2num (k), k <= SCM_LENGTH_MAX);
if (SCM_EQ_P (prot, SCM_BOOL_T))
{
SCM_NEWCELL (v);
if (k > 0)
{
SCM_ASSERT_RANGE (1, scm_long2num (k), k <= SCM_BITVECTOR_MAX_LENGTH);
i = sizeof (long) * ((k + SCM_LONG_BIT - 1) / SCM_LONG_BIT);
SCM_SET_BITVECTOR_BASE (v, (char *) scm_must_malloc (i, "vector"));
SCM_SET_BITVECTOR_LENGTH (v, k);
@ -180,7 +179,7 @@ scm_make_uve (long k, SCM prot)
{
i = sizeof (char) * k;
type = scm_tc7_byvect;
}
}
else if (SCM_CHARP (prot))
{
i = sizeof (char) * k;
@ -216,8 +215,7 @@ scm_make_uve (long k, SCM prot)
return scm_make_vector (SCM_MAKINUM (k), SCM_UNDEFINED);
}
}
else
if (SCM_IMP (prot) || !SCM_INEXACTP (prot))
else if (!SCM_INEXACTP (prot))
/* Huge non-unif vectors are NOT supported. */
/* no special scm_vector */
return scm_make_vector (SCM_MAKINUM (k), SCM_UNDEFINED);
@ -237,6 +235,8 @@ scm_make_uve (long k, SCM prot)
type = scm_tc7_dvect;
}
SCM_ASSERT_RANGE (1, scm_long2num (k), k <= SCM_UVECTOR_MAX_LENGTH);
SCM_NEWCELL (v);
SCM_DEFER_INTS;
SCM_SET_UVECTOR_BASE (v, (char *) scm_must_malloc (i ? i : 1, "vector"));
@ -581,11 +581,7 @@ SCM_DEFINE (scm_dimensions_to_uniform_array, "dimensions->uniform-array", 2, 1,
SCM ra;
if (SCM_INUMP (dims))
{
SCM answer;
SCM_ASSERT_RANGE (1, dims, SCM_INUM (dims) <= SCM_LENGTH_MAX);
answer = scm_make_uve (SCM_INUM (dims), prot);
SCM answer = scm_make_uve (SCM_INUM (dims), prot);
if (!SCM_UNBNDP (fill))
scm_array_fill_x (answer, fill);
else if (SCM_SYMBOLP (prot))
@ -607,8 +603,6 @@ SCM_DEFINE (scm_dimensions_to_uniform_array, "dimensions->uniform-array", 2, 1,
rlen = (s[k].ubnd - s[k].lbnd + 1) * s[k].inc;
}
SCM_ASSERT_RANGE (1, dims, rlen <= SCM_LENGTH_MAX);
SCM_ARRAY_V (ra) = scm_make_uve (rlen, prot);
if (!SCM_UNBNDP (fill))