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

* numbers.c (scm_num2ulong): Check that a bignum is positive

Browse source 
before looking at the magnitude.  Correctly check for overflow
during conversion.
(scm_num2long_long): Likewise.
(scm_num2ulong_long): New.
(ULONG_LONG_MAX): Define if not already defined.
* numbers.h: (scm_num2ulong_long): New prototype.
This commit is contained in:
Marius Vollmer 2001-03-15 20:04:41 +00:00
parent 5345cf7cae
commit caf08e652e
2 changed files with 47 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

52
libguile/numbers.c
View file

@ -4408,6 +4408,10 @@ scm_num2long (SCM num, char *pos, const char *s_caller)
#ifdef HAVE_LONG_LONGS
#ifndef ULONG_LONG_MAX
#define ULONG_LONG_MAX (~0ULL)
#endif
long_long
scm_num2long_long (SCM num, char *pos, const char *s_caller)
{
@ -4417,17 +4421,12 @@ scm_num2long_long (SCM num, char *pos, const char *s_caller)
long long res;
/* can't use res directly in case num is -2^63. */
unsigned long long int pos_res = 0;
unsigned long long int old_res = 0;
scm_sizet l;
for (l = SCM_NUMDIGS (num); l--;) {
pos_res = SCM_LONGLONGBIGUP (pos_res) + SCM_BDIGITS (num)[l];
if (pos_res >= old_res) {
old_res = pos_res;
} else {
/* overflow. */
if (pos_res > SCM_BIGDN(ULONG_LONG_MAX))
scm_out_of_range (s_caller, num);
}
pos_res = SCM_LONGLONGBIGUP (pos_res) + SCM_BDIGITS (num)[l];
}
if (SCM_BIGSIGN (num)) {
res = -pos_res;
@ -4457,6 +4456,45 @@ scm_num2long_long (SCM num, char *pos, const char *s_caller)
}
}
ulong_long
scm_num2ulong_long (SCM num, char *pos, const char *s_caller)
{
if (SCM_INUMP (num))
{
long long nnum = SCM_INUM (num);
if (nnum >= 0)
return nnum;
else
scm_out_of_range (s_caller, num);
}
else if (SCM_BIGP (num))
{
unsigned long long res = 0;
scm_sizet l;
if (SCM_BIGSIGN (num))
scm_out_of_range (s_caller, num);
for (l = SCM_NUMDIGS (num); l--;) {
if (res > SCM_BIGDN(ULONG_LONG_MAX))
scm_out_of_range (s_caller, num);
res = SCM_LONGLONGBIGUP (res) + SCM_BDIGITS (num)[l];
}
return res;
}
else if (SCM_REALP (num))
{
double u = SCM_REAL_VALUE (num);
unsigned long long int res = u;
if ((double) res == u)
return res;
else
scm_out_of_range (s_caller, num);
}
else
scm_wrong_type_arg (s_caller, (int) pos, num);
}
#endif /* HAVE_LONG_LONGS */

2
libguile/numbers.h
View file

@ -295,6 +295,8 @@ extern long scm_num2long (SCM num, char *pos, const char *s_caller);
extern SCM scm_long_long2num (long_long sl);
extern long_long scm_num2long_long (SCM num, char *pos,
const char *s_caller);
extern ulong_long scm_num2ulong_long (SCM num, char *pos,
const char *s_caller);
#endif
extern unsigned long scm_num2ulong (SCM num, char *pos,
const char *s_caller);