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

WIP - support for bignums in rational parsing

Browse source
This commit is contained in:
Justin Ethier 2023-11-20 19:44:17 -08:00
parent cf5b273625
commit 4d902f9a77
1 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
runtime.c
View file

@ -2617,7 +2617,7 @@ int str_is_bignum(str2int_errno errnum, char *c)
return 1; return 1;
} }
double string2rational(char *s) double string2rational(void *data, char *s)
{ {
char *nom = _strdup(s); char *nom = _strdup(s);
char *denom = strchr(nom, '/'); char *denom = strchr(nom, '/');
@ -2627,9 +2627,20 @@ double string2rational(char *s)
} }
denom[0] = '\0'; denom[0] = '\0';
denom++; denom++;
// TODO: clean this up
// TODO: check return values from strtol // TODO: check return values from strtol
double x = strtol(nom, NULL, 10); // double x = strtol(nom, NULL, 10);
double y = strtol(denom, NULL, 10); // double y = strtol(denom, NULL, 10);
alloc_bignum(data, bn_nom);
if (MP_OKAY != mp_read_radix(&(bignum_value(bn_nom)), nom, 10)) {
Cyc_rt_raise2(data, "Error converting string to bignum", nom);
}
double x = mp_get_double(&bignum_value(bn_nom));
alloc_bignum(data, bn_denom);
if (MP_OKAY != mp_read_radix(&(bignum_value(bn_denom)), denom, 10)) {
Cyc_rt_raise2(data, "Error converting string to bignum", denom);
}
double y = mp_get_double(&bignum_value(bn_denom));
return x / y; return x / y;
} }
@ -2645,8 +2656,11 @@ object Cyc_string2number_(void *data, object cont, object str)
rv = str2int(&result, s, 10); rv = str2int(&result, s, 10);
if (rv == STR2INT_SUCCESS) { if (rv == STR2INT_SUCCESS) {
_return_closcall1(data, cont, obj_int2obj(result)); _return_closcall1(data, cont, obj_int2obj(result));
} else if (rv == STR2INT_RATIONAL) { } else if (rv == STR2INT_RATIONAL ||
double d = string2rational(s); // TODO: is there a more efficient way?
((rv == STR2INT_OVERFLOW || rv == STR2INT_UNDERFLOW) &&
strchr(s, '/') != NULL)) {
double d = string2rational(data, s);
make_double(result, d); make_double(result, d);
_return_closcall1(data, cont, &result); _return_closcall1(data, cont, &result);
} else if (str_is_bignum(rv, s)) { } else if (str_is_bignum(rv, s)) {