Fcalva/chibi-scheme
1
0
Fork 0
mirror of https://github.com/ashinn/chibi-scheme.git synced 2025-05-19 05:39:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #647 from ekaitz-zarraga/float_parse

Browse source 
Correct float parsing when exponent has sign
This commit is contained in:
Alex Shinn 2020-05-22 10:35:13 +08:00 • committed by GitHub
commit b459e11ecf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/chibi/json.c
View file

@ -21,7 +21,7 @@ sexp sexp_json_exception (sexp ctx, sexp self, const char* msg, sexp str, const
sexp parse_json_number (sexp ctx, sexp self, sexp str, const char* s, int* i, const int len) { sexp parse_json_number (sexp ctx, sexp self, sexp str, const char* s, int* i, const int len) {
double res = 0, scale = 1; double res = 0, scale = 1;
int j = *i, sign = 1, inexactp = 0; int j = *i, sign = 1, inexactp = 0, scale_sign = 1;
if (s[j] == '+') { if (s[j] == '+') {
++j; ++j;
} else if (s[j] == '-') { } else if (s[j] == '-') {
@ -37,9 +37,17 @@ sexp parse_json_number (sexp ctx, sexp self, sexp str, const char* s, int* i, co
res /= scale; res /= scale;
} else if (j < len && sexp_tolower(s[j]) == 'e') { } else if (j < len && sexp_tolower(s[j]) == 'e') {
inexactp = 1; inexactp = 1;
if (j+1 < len) {
if (s[j+1] == '+') {
++j;
} else if (s[j+1] == '-') {
++j;
scale_sign = -1;
}
}
for (++j, scale=0; j < len && isdigit(s[j]); ) for (++j, scale=0; j < len && isdigit(s[j]); )
scale = scale * 10 + s[j++] - '0'; scale = scale * 10 + s[j++] - '0';
res *= pow(10.0, scale); res *= pow(10.0, scale_sign * scale);
} }
*i = j; *i = j;
return (inexactp || fabs(res) > SEXP_MAX_FIXNUM) ? return (inexactp || fabs(res) > SEXP_MAX_FIXNUM) ?