mirrors/ecl
1
Fork 0
mirror of https://gitlab.com/embeddable-common-lisp/ecl.git synced 2026-01-02 07:30:55 -08:00
Code Issues Projects Releases Packages Wiki Activity

RANDOM overflowed when limit was a bignum too large to fit in a double float

Browse source
This commit is contained in:
jgarcia 2006-11-11 19:11:13 +00:00
parent 14fc59dec5
commit 28a638305c
2 changed files with 35 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/CHANGELOG
View file

@ -107,6 +107,9 @@ ECL 1.0:
#(1 2 3)
> ;;; Warning: Ignoring an unmatched right parenthesis.
- RANDOM no longer overflows when the input is a bignum that does not fit in a
double-float.
* Unicode:
- MAKE-STRING only allowed :ELEMENT-TYPE to be one of CHARACTER, BASE-CHAR, or

63
src/c/num_rand.d
View file

@ -20,38 +20,40 @@
static cl_object
rando(cl_object x, cl_object rs)
{
cl_type tx;
cl_object z;
double d;
tx = type_of(x);
if (number_compare(x, MAKE_FIXNUM(0)) != 1)
FEwrong_type_argument(c_string_to_object("(REAL (0) *)"),
x);
d = (double)(rs->random.value>>1) / (4294967296.0/2.0);
d = number_to_double(x) * d;
if (tx == t_fixnum) {
z = MAKE_FIXNUM((cl_fixnum)d);
} else if (tx == t_bignum) {
z = double_to_integer(d);
} else if (tx == t_singlefloat) {
z = make_singlefloat((float)d);
} else if (tx == t_doublefloat) {
z = make_doublefloat(d);
double d = (double)(rs->random.value>>1) / (4294967296.0/2.0);
AGAIN:
if (number_minusp(x)) {
goto ERROR;
}
#ifdef ECL_LONG_FLOAT
else if (tx == t_longfloat) {
z = make_longfloat(d);
}
#endif
switch (type_of(x)) {
case t_fixnum:
z = MAKE_FIXNUM((cl_fixnum)(fix(x) * d));
break;
case t_bignum:
z = floor1(number_times(x, cl_rational(make_doublefloat(d))));
break;
#ifdef ECL_SHORT_FLOAT
else if (tx == t_shortfloat) {
z = make_shortfloat(d);
}
case t_shortfloat:
z = make_shortfloat(ecl_short_float(x) * (float)d);
break;
#endif
else {
FEerror("~S is not an integer nor a floating-point number.",
1, x);
case t_singlefloat:
z = make_singlefloat(sf(x) * (float)d);
break;
case t_doublefloat:
z = make_doublefloat(df(x) * d);
break;
#ifdef ECL_LONG_FLOAT
case t_longfloat:
z = make_longfloat(ecl_long_float(x) * (long double)d);
break;
#endif
default:
ERROR:
x = ecl_type_error(@'random',"limit",x,
c_string_to_object("(OR (INTEGER 0 *) (FLOAT 0 *))"));
goto AGAIN;
}
return z;
}
@ -88,9 +90,8 @@ advance_random_state(cl_object rs)
@(defun random (x &optional (rs symbol_value(@'*random-state*')))
@
if (type_of(rs) != t_random)
FEwrong_type_argument(@'random-state', rs);
@
rs = ecl_check_cl_type(@'random', rs, t_random);
advance_random_state(rs);
@(return rando(x, rs));
@)