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

Issue #182 - Misc string->number fixes

Browse source
This commit is contained in:
Justin Ethier 2017-03-16 17:27:27 +00:00
parent bb6d822d92
commit 596869f0e0
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
runtime.c
View file

@ -1840,6 +1840,8 @@ object Cyc_string2number2_(void *data, object cont, int argc, object str, ...)
result = (int)strtol(string_str(str), NULL, 2); result = (int)strtol(string_str(str), NULL, 2);
} else if (base_num == 8) { } else if (base_num == 8) {
result = (int)strtol(string_str(str), NULL, 8); result = (int)strtol(string_str(str), NULL, 8);
} else if (base_num == 10) {
Cyc_string2number_(data, cont, str); // Default processing
} else if (base_num == 16) { } else if (base_num == 16) {
result = (int)strtol(string_str(str), NULL, 16); result = (int)strtol(string_str(str), NULL, 16);
} }
@ -1849,7 +1851,7 @@ object Cyc_string2number2_(void *data, object cont, int argc, object str, ...)
if (MP_OKAY != mp_read_radix(&(bignum_value(bn)), string_str(str), base_num)) { if (MP_OKAY != mp_read_radix(&(bignum_value(bn)), string_str(str), base_num)) {
Cyc_rt_raise2(data, "Error converting string to bignum", str); Cyc_rt_raise2(data, "Error converting string to bignum", str);
} }
_return_closcall1(data, cont, bn); _return_closcall1(data, cont, Cyc_bignum_normalize(data, bn));
} else { } else {
_return_closcall1(data, cont, obj_int2obj(result)); _return_closcall1(data, cont, obj_int2obj(result));
} }