Changeset 15149 in webkit for trunk/JavaScriptCore/API/JSObjectRef.cpp

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/JSObjectRef.cpp (modified) (5 diffs)

trunk/JavaScriptCore/API/JSObjectRef.cpp

@@ -46 +46 @@
 
     JSObjectRef objectRef = toRef(jsValue->toObject(exec));
-    // FIXME: What should we do with this exception?
-    if (exec->hadException())
+    if (exec->hadException()) {
         exec->clearException();
+        objectRef = NULL;
+    }
     return objectRef;
 }    
@@ -177 +178 @@
 }
 
-bool JSObjectCallAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef thisObject, size_t argc, JSValueRef argv[], JSValueRef* returnValue)
+JSValueRef JSObjectCallAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef thisObject, size_t argc, JSValueRef argv[], JSValueRef* exception)
 {
     JSLock lock;
@@ -188 +189 @@
         argList.append(toJS(argv[i]));
     
-    *returnValue = jsObject->call(exec, jsThisObject, argList);
+    JSValueRef result = toRef(jsObject->call(exec, jsThisObject, argList));
     if (exec->hadException()) {
+        if (exception)
+            *exception = exec->exception();
+        result = NULL;
         exec->clearException();
-        return false;
-    }
-    return true;
+    }
+    return result;
 }
 
@@ -202 +205 @@
 }
 
-bool JSObjectCallAsConstructor(JSContextRef context, JSObjectRef object, size_t argc, JSValueRef argv[], JSValueRef* returnValue)
+JSObjectRef JSObjectCallAsConstructor(JSContextRef context, JSObjectRef object, size_t argc, JSValueRef argv[], JSValueRef* exception)
 {
     JSLock lock;
@@ -212 +215 @@
         argList.append(toJS(argv[i]));
     
-    *returnValue = jsObject->construct(exec, argList);
+    JSObjectRef result = toRef(jsObject->construct(exec, argList));
     if (exec->hadException()) {
+        if (exception)
+            *exception = exec->exception();
+        result = NULL;
         exec->clearException();
-        return false;
-    }
-    return true;
+    }
+    return result;
 }