Changeset 15149 in webkit for trunk/JavaScriptCore/API/minidom.c

Timestamp:

Jul 3, 2006, 7:35:09 PM (19 years ago)

Author:

ggaren

Message:

Reviewed by Darin.

• Refined value conversions in the API:
  • failed toNumber returns NaN
  • failed toObject returns NULL
  • failed toString returns empty string

• Refined excpetion handling in the API:
  • failed value conversions do not throw exceptions
  • uncaught exceptions in JSEvaluate, JSObjectCallAsFunction, and JSObjectCallAsConstructor are returned through a JSValueRef* exception argument
  • removed JSContextHasException, because JSContextGetException does the same job

• API/JSBase.h:
• API/JSCharBufferRef.cpp: (JSValueCopyStringValue):
• API/JSContextRef.cpp: (JSEvaluate):
• API/JSContextRef.h:
• API/JSNodeList.c: Added test code demonstrating how you would use toNumber, and why you probably don't need toUInt32, etc. (JSNodeListPrototype_item): (JSNodeList_getProperty):
• API/JSObjectRef.cpp: (JSValueToObject): (JSObjectCallAsFunction): (JSObjectCallAsConstructor):
• API/JSObjectRef.h:
• API/JSValueRef.cpp: (JSValueToNumber):
• API/JSValueRef.h:
• API/minidom.c: (main):
• API/testapi.c: (main): Added tests for new rules, and call to JSGCProtect to fix Intel crash
• JavaScriptCore.exp:

File:

• trunk/JavaScriptCore/API/minidom.c (modified) (1 diff)

trunk/JavaScriptCore/API/minidom.c

@@ -50 +50 @@
     char* script = createStringWithContentsOfFile("minidom.js");
     JSCharBufferRef scriptBuf = JSCharBufferCreateUTF8(script);
-    JSValueRef result;
-    JSEvaluate(context, globalObject, scriptBuf, NULL, 0, &result);
-
-    if (JSValueIsUndefined(result))
+    JSValueRef exception;
+    JSValueRef result = JSEvaluate(context, scriptBuf, NULL, NULL, 0, &exception);
+    if (result)
         printf("PASS: Test script executed successfully.\n");
     else {
-        printf("FAIL: Test script returned unexcpected value:\n");
-        JSCharBufferRef resultBuf = JSValueCopyStringValue(context, result);
-        CFStringRef resultCF = CFStringCreateWithJSCharBuffer(kCFAllocatorDefault, resultBuf);
-        CFShow(resultCF);
-        CFRelease(resultCF);
-        JSCharBufferRelease(resultBuf);
+        printf("FAIL: Test script threw exception:\n");
+        JSCharBufferRef exceptionBuf = JSValueCopyStringValue(context, exception);
+        CFStringRef exceptionCF = CFStringCreateWithJSCharBuffer(kCFAllocatorDefault, exceptionBuf);
+        CFShow(exceptionCF);
+        CFRelease(exceptionCF);
+        JSCharBufferRelease(exceptionBuf);
     }
     JSCharBufferRelease(scriptBuf);