kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* util.c (ruby_strtod): improved conversion accuracy.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3692 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2003-04-17 16:49:23 +00:00
parent 57c6f017a0
commit 6940597692
2 changed files with 84 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Fri Apr 18 01:49:18 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
* util.c (ruby_strtod): improved conversion accuracy.
Thu Apr 17 14:39:23 2003 NAKAMURA Usaku <usa@ruby-lang.org> Thu Apr 17 14:39:23 2003 NAKAMURA Usaku <usa@ruby-lang.org>
* ext/dbm/dbm.c (each_pair): add prototype to avoid VC++ warnings. * ext/dbm/dbm.c (each_pair): add prototype to avoid VC++ warnings.

135
util.c
View file

@ -249,7 +249,7 @@ valid_filename(char *s)
if ((fd = _open(s, O_CREAT, 0666)) >= 0) { if ((fd = _open(s, O_CREAT, 0666)) >= 0) {
_close(fd); _close(fd);
_unlink (s); /* don't leave it laying around */ _unlink(s); /* don't leave it laying around */
return 1; return 1;
} }
return 0; return 0;
@ -806,7 +806,6 @@ ruby_strtod(string, endPtr)
if (mantSize == 0) { if (mantSize == 0) {
fraction = 0.0; fraction = 0.0;
p = string; p = string;
goto done;
} }
else { else {
int frac1, frac2; int frac1, frac2;
@ -830,70 +829,94 @@ ruby_strtod(string, endPtr)
} }
frac2 = 10*frac2 + (c - '0'); frac2 = 10*frac2 + (c - '0');
} }
fraction = (1.0e9 * frac1) + frac2;
}
/* /*
* Skim off the exponent. * Skim off the exponent.
*/ */
p = pExp; p = pExp;
if ((*p == 'E') || (*p == 'e')) { if ((*p == 'E') || (*p == 'e')) {
p += 1;
if (*p == '-') {
expSign = TRUE;
p += 1; p += 1;
} if (*p == '-') {
else { expSign = TRUE;
if (*p == '+') {
p += 1; p += 1;
} }
else {
if (*p == '+') {
p += 1;
}
expSign = FALSE;
}
while (ISDIGIT(*p)) {
exp = exp * 10 + (*p - '0');
p += 1;
}
}
if (expSign) {
exp = fracExp - exp;
}
else {
exp = fracExp + exp;
}
/*
* Generate a floating-point number that represents the exponent.
* Do this by processing the exponent one bit at a time to combine
* many powers of 2 of 10. Then combine the exponent with the
* fraction.
*/
if (exp > maxExponent) {
exp = maxExponent;
errno = ERANGE;
}
else if (exp < -maxExponent) {
exp = -maxExponent;
errno = ERANGE;
}
fracExp = exp;
exp += 9;
if (exp < 0) {
expSign = TRUE;
exp = -exp;
}
else {
expSign = FALSE; expSign = FALSE;
} }
while (ISDIGIT(*p)) { dblExp = 1.0;
exp = exp * 10 + (*p - '0'); for (d = powersOf10; exp != 0; exp >>= 1, d += 1) {
p += 1; if (exp & 01) {
dblExp *= *d;
}
}
if (expSign) {
fraction = frac1 / dblExp;
}
else {
fraction = frac1 * dblExp;
}
exp = fracExp;
if (exp < 0) {
expSign = TRUE;
exp = -exp;
}
else {
expSign = FALSE;
}
dblExp = 1.0;
for (d = powersOf10; exp != 0; exp >>= 1, d += 1) {
if (exp & 01) {
dblExp *= *d;
}
}
if (expSign) {
fraction += frac2 / dblExp;
}
else {
fraction += frac2 * dblExp;
} }
} }
if (expSign) {
exp = fracExp - exp;
}
else {
exp = fracExp + exp;
}
/*
* Generate a floating-point number that represents the exponent.
* Do this by processing the exponent one bit at a time to combine
* many powers of 2 of 10. Then combine the exponent with the
* fraction.
*/
if (exp < 0) {
expSign = TRUE;
exp = -exp;
}
else {
expSign = FALSE;
}
if (exp > maxExponent) {
exp = maxExponent;
errno = ERANGE;
}
dblExp = 1.0;
for (d = powersOf10; exp != 0; exp >>= 1, d += 1) {
if (exp & 01) {
dblExp *= *d;
}
}
if (expSign) {
fraction /= dblExp;
}
else {
fraction *= dblExp;
}
done:
if (endPtr != NULL) { if (endPtr != NULL) {
*endPtr = (char *) p; *endPtr = (char *) p;
} }