mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-09 13:30:26 +02:00
Code Activity

* num2integral.i.c (NUM2INTEGRAL): Fixed signedness problem.

Browse source
This commit is contained in:
Dirk Herrmann 2002-02-25 22:48:21 +00:00
parent 4f2716b6f6
commit bac0e23263
2 changed files with 21 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libguile/ChangeLog
View file

@ -1,3 +1,7 @@
2002-01-10 Dirk Herrmann <D.Herrmann@tu-bs.de>
* num2integral.i.c (NUM2INTEGRAL): Fixed signedness problem.
2002-02-25 Gary Houston <ghouston@arglist.com>
* convert.c: include <string.h> for convert_i.c.

30
libguile/num2integral.i.c
View file

@ -27,17 +27,21 @@ NUM2INTEGRAL (SCM num, unsigned long int pos, const char *s_caller)
scm_out_of_range (s_caller, num);
#endif
if (sizeof (ITYPE) >= sizeof (scm_t_signed_bits))
/* can't fit anything too big for this type in an inum
anyway */
return (ITYPE) n;
else
{ /* an inum can be out of range, so check */
if (((ITYPE)n) != n)
scm_out_of_range (s_caller, num);
else
return (ITYPE) n;
}
#if SIZEOF_ITYPE >= SIZEOF_SCM_T_BITS
/* the target type is large enough to hold any possible inum */
return (ITYPE) n;
#else
/* an inum can be out of range, so check */
#ifdef UNSIGNED
/* n is known to be >= 0 */
if ((scm_t_bits) n > UNSIGNED_ITYPE_MAX)
scm_out_of_range (s_caller, num);
#else
if (((ITYPE)n) != n)
scm_out_of_range (s_caller, num);
#endif
return (ITYPE) n;
#endif /* SIZEOF_ITYPE >= SIZEOF_SCM_T_BITS */
}
else if (SCM_BIGP (num))
{ /* bignum */
@ -78,9 +82,9 @@ NUM2INTEGRAL (SCM num, unsigned long int pos, const char *s_caller)
scm_out_of_range (s_caller, num);
}
#endif
#else /* SIZEOF_ITYPE >= SIZEOF_SCM_T_BITS */
scm_out_of_range (s_caller, num);
scm_out_of_range (s_caller, num);
#endif
}