Changeset 15149 in webkit for trunk/JavaScriptCore/API/JSContextRef.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/JSContextRef.cpp (modified) (3 diffs)

trunk/JavaScriptCore/API/JSContextRef.cpp

@@ -72 +72 @@
 }
 
-bool JSEvaluate(JSContextRef context, JSValueRef thisValue, JSCharBufferRef script, JSCharBufferRef sourceURL, int startingLineNumber, JSValueRef* returnValue)
+JSValueRef JSEvaluate(JSContextRef context, JSCharBufferRef script, JSValueRef thisValue, JSCharBufferRef sourceURL, int startingLineNumber, JSValueRef* exception)
 {
     JSLock lock;
@@ -79 +79 @@
     UString::Rep* scriptRep = toJS(script);
     UString::Rep* sourceURLRep = toJS(sourceURL);
+    // Interpreter::evaluate sets thisValue to the global object if it is NULL
     Completion completion = exec->dynamicInterpreter()->evaluate(UString(sourceURLRep), startingLineNumber, UString(scriptRep), jsThisValue);
 
-    if (returnValue)
-        *returnValue = completion.value() ? toRef(completion.value()) : toRef(jsUndefined());
-
-    return completion.complType() != Throw;
+    if (completion.complType() == Throw) {
+        if (exception)
+            *exception = completion.value();
+        return NULL;
+    }
+    
+    if (completion.value())
+        return toRef(completion.value());
+    
+    // happens, for example, when the only statement is an empty (';') statement
+    return toRef(jsUndefined());
 }
 
@@ -93 +101 @@
     UString::Rep* rep = toJS(script);
     return exec->dynamicInterpreter()->checkSyntax(UString(rep));
-}
-
-bool JSContextHasException(JSContextRef context)
-{
-    ExecState* exec = toJS(context);
-    return exec->hadException();
 }