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

Timestamp:

Jun 21, 2009, 4:02:13 PM (16 years ago)

Author:

[email protected]

Message:

Bug 26587: Support JSON.parse
<​https://bugs.webkit.org/show_bug.cgi?id=26587>

Reviewed by Darin Adler and Cameron Zwarich.

Extend the LiteralParser to support the full strict JSON
grammar, fix a few places where the grammar was incorrectly
lenient. Doesn't yet support the JSON.parse reviver function
but that does not block the JSON.parse functionality itself.

File:

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

trunk/JavaScriptCore/runtime/JSONObject.cpp

@@ -30 +30 @@
 #include "ExceptionHelpers.h"
 #include "JSArray.h"
+#include "LiteralParser.h"
 #include "PropertyNameArray.h"
 #include <wtf/MathExtras.h>
@@ -37 +38 @@
 ASSERT_CLASS_FITS_IN_CELL(JSONObject);
 
+static JSValue JSC_HOST_CALL JSONProtoFuncParse(ExecState*, JSObject*, JSValue, const ArgList&);
 static JSValue JSC_HOST_CALL JSONProtoFuncStringify(ExecState*, JSObject*, JSValue, const ArgList&);
 
@@ -563 +565 @@
 /* Source for JSONObject.lut.h
 @begin jsonTable
+  parse         JSONProtoFuncParse             DontEnum|Function 1
   stringify     JSONProtoFuncStringify         DontEnum|Function 1
 @end
@@ -583 +586 @@
 {
     stringifier->mark();
+}
+
+// ECMA-262 v5 15.12.3
+JSValue JSC_HOST_CALL JSONProtoFuncParse(ExecState* exec, JSObject*, JSValue, const ArgList& args)
+{
+    if (args.isEmpty())
+        return throwError(exec, GeneralError, "JSON.parse requires at least one parameter");
+    JSValue value = args.at(0);
+    UString source = value.toString(exec);
+    if (exec->hadException())
+        return jsNull();
+    
+    LiteralParser jsonParser(exec, source, LiteralParser::StrictJSON);
+    JSValue parsedObject = jsonParser.tryLiteralParse();
+    if (!parsedObject)
+        return throwError(exec, SyntaxError, "Unable to parse JSON string");
+    
+    return parsedObject;
 }