Changeset 44974 in webkit for trunk/JavaScriptCore/runtime/JSONObject.cpp

Timestamp:

Jun 22, 2009, 10:44:55 PM (16 years ago)

Author:

[email protected]

Message:

Bug 26640: JSON.stringify needs to special case Boolean objects
<​https://bugs.webkit.org/show_bug.cgi?id=26640>

Reviewed by Alexey Proskuryakov.

Add special case handling of the Boolean object so we match current
ES5 errata.

File:

• trunk/JavaScriptCore/runtime/JSONObject.cpp (modified) (4 diffs)

trunk/JavaScriptCore/runtime/JSONObject.cpp

@@ -27 +27 @@
 #include "JSONObject.h"
 
+#include "BooleanObject.h"
 #include "Error.h"
 #include "ExceptionHelpers.h"
@@ -120 +121 @@
 // ------------------------------ helper functions --------------------------------
 
-static inline JSValue unwrapNumberOrString(JSValue value)
+static inline JSValue unwrapBoxedPrimitive(JSValue value)
 {
     if (!value.isObject())
         return value;
-    if (!asObject(value)->inherits(&NumberObject::info) && !asObject(value)->inherits(&StringObject::info))
+    if (!asObject(value)->inherits(&NumberObject::info) && !asObject(value)->inherits(&StringObject::info) && !asObject(value)->inherits(&BooleanObject::info))
         return value;
     return static_cast<JSWrapperObject*>(asObject(value))->internalValue();
@@ -131 +132 @@
 static inline UString gap(JSValue space)
 {
-    space = unwrapNumberOrString(space);
+    space = unwrapBoxedPrimitive(space);
 
     // If the space value is a number, create a gap string with that number of spaces.
@@ -356 +357 @@
     }
 
+    value = unwrapBoxedPrimitive(value);
+
     if (value.isBoolean()) {
         builder.append(value.getBoolean() ? "true" : "false");
         return StringifySucceeded;
     }
-
-    value = unwrapNumberOrString(value);
 
     UString stringValue;