Changeset 14932 in webkit for trunk/JavaScriptCore

Timestamp:

Jun 20, 2006, 5:20:00 PM (19 years ago)

Author:

thatcher

Message:

Reviewed by Geoff.

Make sure we clear the exception before returning so
that future calls will not fail because of an earlier
exception state. Assert on entry that the WebScriptObject
is working with an ExecState that dose not have an exception.
Document that evaluateWebScript and callWebScriptMethod return
WebUndefined when an exception is thrown.

• bindings/objc/WebScriptObject.h:
• bindings/objc/WebScriptObject.mm: (-[WebScriptObject callWebScriptMethod:withArguments:]): (-[WebScriptObject evaluateWebScript:]): (-[WebScriptObject setValue:forKey:]): (-[WebScriptObject valueForKey:]): (-[WebScriptObject removeWebScriptKey:]): (-[WebScriptObject webScriptValueAtIndex:]): (-[WebScriptObject setWebScriptValueAtIndex:value:]):

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/objc/WebScriptObject.h (modified) (3 diffs)
• bindings/objc/WebScriptObject.mm (modified) (14 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2006-06-20  Timothy Hatcher  <[email protected]>
+
+        Reviewed by Geoff.
+
+        Make sure we clear the exception before returning so
+        that future calls will not fail because of an earlier
+        exception state. Assert on entry that the WebScriptObject
+        is working with an ExecState that dose not have an exception. 
+        Document that evaluateWebScript and callWebScriptMethod return
+        WebUndefined when an exception is thrown.
+
+        * bindings/objc/WebScriptObject.h:
+        * bindings/objc/WebScriptObject.mm:
+        (-[WebScriptObject callWebScriptMethod:withArguments:]):
+        (-[WebScriptObject evaluateWebScript:]):
+        (-[WebScriptObject setValue:forKey:]):
+        (-[WebScriptObject valueForKey:]):
+        (-[WebScriptObject removeWebScriptKey:]):
+        (-[WebScriptObject webScriptValueAtIndex:]):
+        (-[WebScriptObject setWebScriptValueAtIndex:value:]):
+
 2006-06-19  Anders Carlsson  <[email protected]>
 

trunk/JavaScriptCore/bindings/objc/WebScriptObject.h

@@ -188 +188 @@
     specified arguments.
     @result Returns the result of calling the script method.
+    Returns WebUndefined when an exception is thrown in the script environment.
 */
 - (id)callWebScriptMethod:(NSString *)name withArguments:(NSArray *)args;
@@ -197 +198 @@
     of the script is dependent of the target script environment.
     @result Returns the result of evaluating the script in the script environment.
+    Returns WebUndefined when an exception is thrown in the script environment.
 */
 - (id)evaluateWebScript:(NSString *)script;
@@ -219 +221 @@
     @param index The index of the property to return.  Index based access is dependent 
     @discussion Gets the value of the property at the specified index.
-    @result The value of the property.
+    @result The value of the property. Returns WebUndefined when an exception is
+    thrown in the script environment.
 */
 - (id)webScriptValueAtIndex:(unsigned int)index;

trunk/JavaScriptCore/bindings/objc/WebScriptObject.mm

@@ -176 +176 @@
     // Lookup the function object.
     ExecState *exec = [self _executionContext]->interpreter()->globalExec();
+    ASSERT(!exec->hadException());
 
     JSLock lock;
@@ -197 +198 @@
         LOG_EXCEPTION (exec);
         result = jsUndefined();
+        exec->clearException();
     }
 
@@ -216 +218 @@
     
     ExecState *exec = [self _executionContext]->interpreter()->globalExec();
+    ASSERT(!exec->hadException());
+
     JSValue *result;
-    
     JSLock lock;
     
@@ -234 +237 @@
         LOG_EXCEPTION (exec);
         result = jsUndefined();
+        exec->clearException();
     }
     
@@ -252 +256 @@
 
     ExecState *exec = [self _executionContext]->interpreter()->globalExec();
+    ASSERT(!exec->hadException());
 
     JSLock lock;
@@ -259 +264 @@
     if (exec->hadException()) {
         LOG_EXCEPTION (exec);
+        exec->clearException();
     }
 
@@ -273 +279 @@
 
     ExecState *exec = [self _executionContext]->interpreter()->globalExec();
+    ASSERT(!exec->hadException());
 
     JSLock lock;
@@ -281 +288 @@
         LOG_EXCEPTION (exec);
         result = jsUndefined();
+        exec->clearException();
     }
 
@@ -301 +309 @@
 
     ExecState *exec = [self _executionContext]->interpreter()->globalExec();
+    ASSERT(!exec->hadException());
 
     JSLock lock;
@@ -308 +317 @@
     if (exec->hadException()) {
         LOG_EXCEPTION (exec);
+        exec->clearException();
     }
 
@@ -341 +351 @@
 
     ExecState *exec = [self _executionContext]->interpreter()->globalExec();
+    ASSERT(!exec->hadException());
+
     JSLock lock;
     JSValue *result = [self _imp]->get (exec, (unsigned)index);
@@ -347 +359 @@
         LOG_EXCEPTION (exec);
         result = jsUndefined();
+        exec->clearException();
     }
 
@@ -365 +378 @@
 
     ExecState *exec = [self _executionContext]->interpreter()->globalExec();
+    ASSERT(!exec->hadException());
+
     JSLock lock;
     [self _imp]->put (exec, (unsigned)index, (convertObjcValueToValue(exec, &value, ObjcObjectType)));
@@ -370 +385 @@
     if (exec->hadException()) {
         LOG_EXCEPTION (exec);
+        exec->clearException();
     }