Changeset 88605 in webkit for trunk/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp

Timestamp:

Jun 11, 2011, 1:16:46 PM (14 years ago)

Author:

[email protected]

Message:

​https://bugs.webkit.org/show_bug.cgi?id=16777

Reviewed by Darin Adler.

Remove #define NaN per Darin's comments.

• runtime/JSGlobalObjectFunctions.cpp:

(JSC::parseIntOverflow):
(JSC::parseInt):
(JSC::jsStrDecimalLiteral):
(JSC::jsToNumber):
(JSC::parseFloat):

• wtf/DateMath.cpp:

(WTF::equivalentYearForDST):
(WTF::parseES5DateFromNullTerminatedCharacters):
(WTF::parseDateFromNullTerminatedCharacters):
(WTF::timeClip):
(JSC::parseDateFromNullTerminatedCharacters):

File:

• trunk/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp (modified) (13 diffs)

trunk/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp

@@ -49 +49 @@
 
 namespace JSC {
-
-#define NaN std::numeric_limits<double>::quiet_NaN()
-#define Inf std::numeric_limits<double>::infinity()
 
 static JSValue encode(ExecState* exec, const char* doNotEscape)
@@ -183 +180 @@
 
     for (const char* p = s + length - 1; p >= s; p--) {
-        if (radixMultiplier == Inf) {
+        if (radixMultiplier == std::numeric_limits<double>::infinity()) {
             if (*p != '0') {
-                number = Inf;
+                number = std::numeric_limits<double>::infinity();
                 break;
             }
@@ -205 +202 @@
 
     for (const UChar* p = s + length - 1; p >= s; p--) {
-        if (radixMultiplier == Inf) {
+        if (radixMultiplier == std::numeric_limits<double>::infinity()) {
             if (*p != '0') {
-                number = Inf;
+                number = std::numeric_limits<double>::infinity();
                 break;
             }
@@ -251 +248 @@
 
     if (radix < 2 || radix > 36)
-        return NaN;
+        return std::numeric_limits<double>::quiet_NaN();
 
     int firstDigitPosition = p;
@@ -274 +271 @@
 
     if (!sawDigit)
-        return NaN;
+        return std::numeric_limits<double>::quiet_NaN();
 
     return sign * number;
@@ -342 +339 @@
         if (isInfinity(data, end)) {
             data += SizeOfInfinity;
-            return Inf;
+            return std::numeric_limits<double>::infinity();
         }
         break;
@@ -349 +346 @@
         if (isInfinity(data + 1, end)) {
             data += SizeOfInfinity + 1;
-            return Inf;
+            return std::numeric_limits<double>::infinity();
         }
         break;
@@ -356 +353 @@
         if (isInfinity(data + 1, end)) {
             data += SizeOfInfinity + 1;
-            return -Inf;
+            return -std::numeric_limits<double>::infinity();
         }
         break;
@@ -362 +359 @@
 
     // Not a number.
-    return NaN;
+    return std::numeric_limits<double>::quiet_NaN();
 }
 
@@ -376 +373 @@
         if (isStrWhiteSpace(c))
             return 0;
-        return NaN;
+        return std::numeric_limits<double>::quiet_NaN();
     }
 
@@ -404 +401 @@
     }
     if (data != end)
-        return NaN;
+        return std::numeric_limits<double>::quiet_NaN();
 
     return number;
@@ -417 +414 @@
         if (isASCIIDigit(c))
             return c - '0';
-        return NaN;
+        return std::numeric_limits<double>::quiet_NaN();
     }
 
@@ -431 +428 @@
     // Empty string.
     if (data == end)
-        return NaN;
+        return std::numeric_limits<double>::quiet_NaN();
 
     return jsStrDecimalLiteral(data, end);