Changeset 56189 in webkit for trunk/JavaScriptCore/API/JSValueRef.cpp

Timestamp:

Mar 18, 2010, 1:51:23 PM (15 years ago)

Author:

[email protected]

Message:

2010-03-18 Oliver Hunt <​[email protected]>

Reviewed by Sam Weinig.

Add API to directly expose JSON parsing
​https://bugs.webkit.org/show_bug.cgi?id=34887

Add API to expose JSON parsing directly, and add tests to testapi

• API/JSValueRef.cpp: (JSValueMakeFromJSONString): (JSValueCreateJSONString):
• API/tests/testapi.c: (main):
• JavaScriptCore.exp:
• runtime/JSONObject.cpp: (JSC::JSONStringify):
• runtime/JSONObject.h:

File:

• trunk/JavaScriptCore/API/JSValueRef.cpp (modified) (2 diffs)

trunk/JavaScriptCore/API/JSValueRef.cpp

@@ -32 +32 @@
 
 #include <runtime/JSGlobalObject.h>
+#include <runtime/JSONObject.h>
 #include <runtime/JSString.h>
+#include <runtime/LiteralParser.h>
 #include <runtime/Operations.h>
 #include <runtime/Protect.h>
@@ -222 +224 @@
 }
 
+JSValueRef JSValueMakeFromJSONString(JSContextRef ctx, JSStringRef string)
+{
+    ExecState* exec = toJS(ctx);
+    APIEntryShim entryShim(exec);
+    LiteralParser parser(exec, string->ustring(), LiteralParser::StrictJSON);
+    return toRef(exec, parser.tryLiteralParse());
+}
+
+JSStringRef JSValueCreateJSONString(JSContextRef ctx, JSValueRef apiValue, unsigned indent, JSValueRef* exception)
+{
+    ExecState* exec = toJS(ctx);
+    APIEntryShim entryShim(exec);
+    JSValue value = toJS(exec, apiValue);
+    UString result = JSONStringify(exec, value, indent);
+    if (exception)
+        *exception = 0;
+    if (exec->hadException()) {
+        if (exception)
+            *exception = toRef(exec, exec->exception());
+        exec->clearException();
+        return 0;
+    }
+    return OpaqueJSString::create(result).releaseRef();
+}
+
 bool JSValueToBoolean(JSContextRef ctx, JSValueRef value)
 {