Changeset 94811 in webkit for trunk/Source/JavaScriptCore/runtime/Completion.cpp

Timestamp:

Sep 8, 2011, 3:38:44 PM (14 years ago)

Author:

[email protected]

Message:

Remove the Completion object from JSC, I have never liked it
​https://bugs.webkit.org/show_bug.cgi?id=67755

Reviewed by Gavin Barraclough.

../JavaScriptCore:

• Removes the Completion object and replaces its use with out parameter exceptions.
• Remove ComplType and virtual exceptionType() function on JSObject. Replace with ClassInfo for InterruptedExecutionError and TerminatedExecutionError.

• API/JSBase.cpp:

(JSEvaluateScript):
(JSCheckScriptSyntax):

• JavaScriptCore.exp:
• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def:
• interpreter/Interpreter.cpp:

(JSC::Interpreter::throwException):

• jsc.cpp:

(functionLoad):
(functionCheckSyntax):
(runWithScripts):
(runInteractive):

• runtime/Completion.cpp:

(JSC::checkSyntax):
(JSC::evaluate):

• runtime/Completion.h:
• runtime/ExceptionHelpers.cpp:

(JSC::InterruptedExecutionError::toString):
(JSC::TerminatedExecutionError::toString):
(JSC::createInterruptedExecutionException):

• runtime/ExceptionHelpers.h:

(JSC::InterruptedExecutionError::InterruptedExecutionError):
(JSC::InterruptedExecutionError::create):
(JSC::InterruptedExecutionError::createStructure):
(JSC::TerminatedExecutionError::TerminatedExecutionError):
(JSC::TerminatedExecutionError::create):
(JSC::TerminatedExecutionError::createStructure):

• runtime/JSGlobalData.cpp:

(JSC::JSGlobalData::JSGlobalData):

• runtime/JSObject.h:

../JavaScriptGlue:

• JSRun.cpp:

(JSRun::Evaluate):
(JSRun::CheckSyntax):

• JSRun.h:
• JavaScriptGlue.cpp:

(JSRunEvaluate):

../WebCore:

• bindings/js/JSDOMBinding.cpp:

(WebCore::reportException):

• bindings/js/JSEventListener.cpp:

(WebCore::JSEventListener::handleEvent):

• bindings/js/JSInjectedScriptManager.cpp:

(WebCore::InjectedScriptManager::createInjectedScript):

• bindings/js/JSMainThreadExecState.h:

(WebCore::JSMainThreadExecState::evaluate):

• bindings/js/ScriptController.cpp:

(WebCore::ScriptController::evaluateInWorld):

• bindings/js/WorkerScriptController.cpp:

(WebCore::WorkerScriptController::evaluate):

• bindings/objc/WebScriptObject.mm:

(-[WebScriptObject evaluateWebScript:]):

• bridge/NP_jsobject.cpp:

(_NPN_Evaluate):

• bridge/jni/jni_jsobject.mm:

(JavaJSObject::eval):

../WebKit/mac:

• Plugins/Hosted/NetscapePluginInstanceProxy.mm:

(WebKit::NetscapePluginInstanceProxy::evaluate):

../WebKit/qt:

• Api/qwebelement.cpp:

(QWebElement::evaluateJavaScript):

../WebKit2:

• WebProcess/Plugins/Netscape/NPRuntimeObjectMap.cpp:

(WebKit::NPRuntimeObjectMap::evaluate):

File:

• trunk/Source/JavaScriptCore/runtime/Completion.cpp (modified) (4 diffs)

trunk/Source/JavaScriptCore/runtime/Completion.cpp

@@ -35 +35 @@
 namespace JSC {
 
-Completion checkSyntax(ExecState* exec, const SourceCode& source)
+bool checkSyntax(ExecState* exec, const SourceCode& source, JSValue* returnedException)
 {
     JSLock lock(exec);
@@ -42 +42 @@
     ProgramExecutable* program = ProgramExecutable::create(exec, source);
     JSObject* error = program->checkSyntax(exec);
-    if (error)
-        return Completion(Throw, error);
+    if (error) {
+        if (returnedException)
+            *returnedException = error;
+        return false;
+    }
 
-    return Completion(Normal);
+    return true;
 }
 
-Completion evaluate(ExecState* exec, ScopeChainNode* scopeChain, const SourceCode& source, JSValue thisValue)
+JSValue evaluate(ExecState* exec, ScopeChainNode* scopeChain, const SourceCode& source, JSValue thisValue, JSValue* returnedException)
 {
     JSLock lock(exec);
@@ -55 +58 @@
     ProgramExecutable* program = ProgramExecutable::create(exec, source);
     if (!program) {
-        JSValue exception = exec->globalData().exception;
+        if (returnedException)
+            *returnedException = exec->globalData().exception;
+
         exec->globalData().exception = JSValue();
-        return Completion(Throw, exception);
+        return jsUndefined();
     }
 
@@ -63 +68 @@
         thisValue = exec->dynamicGlobalObject();
     JSObject* thisObj = thisValue.toThisObject(exec);
-
     JSValue result = exec->interpreter()->execute(program, exec, scopeChain, thisObj);
 
     if (exec->hadException()) {
-        JSValue exception = exec->exception();
+        if (returnedException)
+            *returnedException = exec->exception();
+
         exec->clearException();
+        return jsUndefined();
+    }
 
-        ComplType exceptionType = Throw;
-        if (exception.isObject())
-            exceptionType = asObject(exception)->exceptionType();
-        return Completion(exceptionType, exception);
-    }
-    return Completion(Normal, result);
+    ASSERT(result);
+    return result;
 }