suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove unneeded use of long-double function

Browse Source 
Using stdtold() instead of strtod() causes trouble with the
version of gcc on Fedora 6.

Merge to v6.5
This commit is contained in:
Matthew Flatt 2016-04-17 11:29:08 -06:00
parent f75729ef41
commit dda791c8cb
1 changed files with 4 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
racket/src/racket/src/numstr.c
View File

@ -383,7 +383,7 @@ static Scheme_Object *read_special_number(const mzchar *str, int pos)
END_XFORM_ARITH; END_XFORM_ARITH;
# endif # endif
static double STRTOD(const char *orig_c, char **f, int extfl) static double STRTOD(const char *orig_c, char **f)
{ {
int neg = 0; int neg = 0;
int found_dot = 0, is_infinity = 0, is_zero = 0, is_nonzero = 0; int found_dot = 0, is_infinity = 0, is_zero = 0, is_nonzero = 0;
@ -431,7 +431,7 @@ static double STRTOD(const char *orig_c, char **f, int extfl)
return 0; /* not a digit - bad! */ return 0; /* not a digit - bad! */
else { else {
e = (e * 10) + (ch - '0'); e = (e * 10) + (ch - '0');
if (e > CHECK_INF_EXP_THRESHOLD(extfl)) { if (e > CHECK_INF_EXP_THRESHOLD(0)) {
if (neg_exp || !is_nonzero) if (neg_exp || !is_nonzero)
is_zero = 1; is_zero = 1;
else else
@ -451,24 +451,6 @@ static double STRTOD(const char *orig_c, char **f, int extfl)
*f = (char *)c; *f = (char *)c;
#ifdef MZ_LONG_DOUBLE
if (is_infinity) {
if (neg)
return scheme_long_minus_infinity_val;
else
return scheme_long_infinity_val;
}
if (is_zero) {
if (neg)
return scheme_long_floating_point_nzero;
else
return scheme_long_floating_point_zero;
}
/* It's OK if c is ok: */
return strtold(orig_c, NULL);
#else
if (is_infinity) { if (is_infinity) {
if (neg) if (neg)
return scheme_minus_infinity_val; return scheme_minus_infinity_val;
@ -485,14 +467,13 @@ static double STRTOD(const char *orig_c, char **f, int extfl)
/* It's OK if c is ok: */ /* It's OK if c is ok: */
return strtod(orig_c, NULL); return strtod(orig_c, NULL);
#endif
} }
# ifdef MZ_XFORM_GC # ifdef MZ_XFORM_GC
START_XFORM_ARITH; START_XFORM_ARITH;
# endif # endif
#else #else
# define STRTOD(x, y, extfl) strtod(x, y) # define STRTOD(x, y) strtod(x, y)
#endif #endif
#ifdef MZ_LONG_DOUBLE #ifdef MZ_LONG_DOUBLE
@ -1265,7 +1246,7 @@ Scheme_Object *scheme_read_number(const mzchar *str, intptr_t len,
ld = long_double_from_string(ffl_buf, &ptr); ld = long_double_from_string(ffl_buf, &ptr);
else else
#endif #endif
d = STRTOD(ffl_buf, &ptr, 0); d = STRTOD(ffl_buf, &ptr);
scheme_pop_c_numeric_locale(loc); scheme_pop_c_numeric_locale(loc);