Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-14 13:55:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 613492 - Remove Infinity and NaN checks from dtoa, so that isNaN(parseFloat("infinity")). r=jwalden

Browse Source 
--HG--
extra : rebase_source : 52af19d3046baa27cfc65451301eb6d413761986
This commit is contained in:
Jan de Mooij 2010-11-19 13:56:27 +01:00
parent 88e6ba5ed6
commit 28d89e5beb
3 changed files with 25 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
js/src/dtoa.c
View File

@ -116,13 +116,6 @@
* all dtoa conversions in single-threaded executions with 8-byte * all dtoa conversions in single-threaded executions with 8-byte
* pointers, PRIVATE_MEM >= 7400 appears to suffice; with 4-byte * pointers, PRIVATE_MEM >= 7400 appears to suffice; with 4-byte
* pointers, PRIVATE_MEM >= 7112 appears adequate. * pointers, PRIVATE_MEM >= 7112 appears adequate.
* #define NO_INFNAN_CHECK if you do not wish to have INFNAN_CHECK
* #defined automatically on IEEE systems. On such systems,
* when INFNAN_CHECK is #defined, strtod checks
* for Infinity and NaN (case insensitively). On some systems
* (e.g., some HP systems), it may be necessary to #define NAN_WORD0
* appropriately -- to the most significant word of a quiet NaN.
* (On HP Series 700/800 machines, -DNAN_WORD0=0x7ff40000 works.)
* #define MULTIPLE_THREADS if the system offers preemptively scheduled * #define MULTIPLE_THREADS if the system offers preemptively scheduled
* multiple threads. In this case, you must provide (or suitably * multiple threads. In this case, you must provide (or suitably
* #define) two locks, acquired by ACQUIRE_DTOA_LOCK(n) and freed * #define) two locks, acquired by ACQUIRE_DTOA_LOCK(n) and freed
@ -212,15 +205,6 @@ extern void *MALLOC(size_t);
#define IEEE_Arith #define IEEE_Arith
#endif #endif
#ifdef IEEE_Arith
#ifndef NO_INFNAN_CHECK
#undef INFNAN_CHECK
#define INFNAN_CHECK
#endif
#else
#undef INFNAN_CHECK
#endif
#include "errno.h" #include "errno.h"
#ifdef Bad_float_h #ifdef Bad_float_h
@ -1490,39 +1474,6 @@ static CONST double tinytens[] = { 1e-16, 1e-32 };
#endif #endif
#endif #endif
#ifdef INFNAN_CHECK
#ifndef NAN_WORD0
#define NAN_WORD0 0x7ff80000
#endif
#ifndef NAN_WORD1
#define NAN_WORD1 0
#endif
static int
match
#ifdef KR_headers
(sp, t) char **sp, *t;
#else
(CONST char **sp, CONST char *t)
#endif
{
int c, d;
CONST char *s = *sp;
while((d = *t++)) {
if ((c = *++s) >= 'A' && c <= 'Z')
c += 'a' - 'A';
if (c != d)
return 0;
}
*sp = s + 1;
return 1;
}
#endif /* INFNAN_CHECK */
static double static double
_strtod _strtod
#ifdef KR_headers #ifdef KR_headers
@ -1683,29 +1634,6 @@ _strtod
} }
if (!nd) { if (!nd) {
if (!nz && !nz0) { if (!nz && !nz0) {
#ifdef INFNAN_CHECK
/* Check for Nan and Infinity */
switch(c) {
case 'i':
case 'I':
if (match(&s,"nf")) {
--s;
if (!match(&s,"inity"))
++s;
word0(rv) = 0x7ff00000;
word1(rv) = 0;
goto ret;
}
break;
case 'n':
case 'N':
if (match(&s, "an")) {
word0(rv) = NAN_WORD0;
word1(rv) = NAN_WORD1;
goto ret;
}
}
#endif /* INFNAN_CHECK */
ret0: ret0:
s = s00; s = s00;
sign = 0; sign = 0;

1
js/src/tests/ecma_5/Global/jstests.list
View File

@ -1,5 +1,6 @@
url-prefix ../../jsreftest.html?test=ecma_5/Global/ url-prefix ../../jsreftest.html?test=ecma_5/Global/
script parseInt-01.js script parseInt-01.js
script parseFloat-01.js
script eval-01.js script eval-01.js
script eval-02.js script eval-02.js
script eval-inside-with-is-direct.js script eval-inside-with-is-direct.js

24
js/src/tests/ecma_5/Global/parseFloat-01.js Normal file
View File

@ -0,0 +1,24 @@
// Any copyright is dedicated to the Public Domain.
// http://creativecommons.org/licenses/publicdomain/
//-----------------------------------------------------------------------------
var BUGNUMBER = 613492;
var summary = "ES5 15.1.2.3 parseFloat(string)";
print(BUGNUMBER + ": " + summary);
assertEq(parseFloat("Infinity"), Infinity);
assertEq(parseFloat("+Infinity"), Infinity);
assertEq(parseFloat("-Infinity"), -Infinity);
assertEq(parseFloat("inf"), NaN);
assertEq(parseFloat("Inf"), NaN);
assertEq(parseFloat("infinity"), NaN);
assertEq(parseFloat("nan"), NaN);
assertEq(parseFloat("NaN"), NaN);
if (typeof reportCompare === "function")
reportCompare(true, true);
print("All tests passed!");