Fcalva/cyclone
1
0
Fork 0
mirror of https://github.com/justinethier/cyclone.git synced 2025-07-06 04:36:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Do not call mp_expt_d for negative exponents

Browse source
This commit is contained in:
Justin Ethier 2017-02-17 12:53:16 +00:00
parent 46c41be356
commit 733ae48534
1 changed files with 26 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
runtime.c
View file

@ -3139,27 +3139,26 @@ bad_arg_type_error:
}
}
void Cyc_expt_double(void *data, object cont, double x, double y)
{
make_double(d, pow(x, y));
return_closcall1(data, cont, &d);
}
void Cyc_expt(void *data, object cont, object x, object y)
{
// // TODO: if either is double, promote result to double
// // if both int, do mp_expt_d and normalize back to fixnum if necessary
//// c = a **b
//// int mp_expt_d(mp_int *a, mp_digit b, mp_int *c);
// make_double(d, 0.0);
// Cyc_check_num(data, z1);
// Cyc_check_num(data, z2);
// d.value = pow( unbox_number(z1), unbox_number(z2) );
// return_closcall1(data, cont, &d);
if (obj_is_int(x)){
if (obj_is_int(y)){
make_empty_bignum(bn);
Cyc_int2bignum(obj_obj2int(x), &(bn.bn));
mp_expt_d(&bignum_value(&bn), obj_obj2int(y), &bignum_value(&bn));
return_closcall1(data, cont, Cyc_bignum_normalize(data, &bn));
if (obj_obj2int(y) < 0) {
Cyc_expt_double(data, cont, (double)obj_obj2int(x), (double)obj_obj2int(y));
} else {
make_empty_bignum(bn);
Cyc_int2bignum(obj_obj2int(x), &(bn.bn));
mp_expt_d(&bignum_value(&bn), obj_obj2int(y), &bignum_value(&bn));
return_closcall1(data, cont, Cyc_bignum_normalize(data, &bn));
}
} else if (is_object_type(y) && type_of(y) == double_tag) {
make_double(d, 0.0);
d.value = pow((double)obj_obj2int(x), double_value(y));
return_closcall1(data, cont, &d);
Cyc_expt_double(data, cont, (double)obj_obj2int(x), double_value(y));
} else if (is_object_type(y) && type_of(y) == bignum_tag) {
// TODO:
}
@ -3178,13 +3177,18 @@ void Cyc_expt(void *data, object cont, object x, object y)
}
if (is_object_type(x) && type_of(x) == bignum_tag) {
if (obj_is_int(y)){
make_empty_bignum(bn);
mp_expt_d(&bignum_value(x), obj_obj2int(y), &bignum_value(&bn));
return_closcall1(data, cont, Cyc_bignum_normalize(data, &bn));
if (obj_obj2int(y) < 0) {
Cyc_expt_double(data, cont, mp_get_double(&bignum_value(x)), (double)obj_obj2int(y));
} else {
make_empty_bignum(bn);
mp_expt_d(&bignum_value(x), obj_obj2int(y), &bignum_value(&bn));
return_closcall1(data, cont, Cyc_bignum_normalize(data, &bn));
}
} else if (is_object_type(y) && type_of(y) == double_tag) {
make_double(d, 0.0);
d.value = pow(mp_get_double(&bignum_value(x)), double_value(y));
return_closcall1(data, cont, &d);
Cyc_expt_double(data, cont, mp_get_double(&bignum_value(x)), double_value(y));
//make_double(d, 0.0);
//d.value = pow(mp_get_double(&bignum_value(x)), double_value(y));
//return_closcall1(data, cont, &d);
} else if (is_object_type(y) && type_of(y) == bignum_tag) {
// TODO:
}