JavaScriptCore-7601.1.46.3.tar.gz

[apple/javascriptcore.git] / runtime / Completion.cpp

diff --git a/runtime/Completion.cpp b/runtime/Completion.cpp
index c414570dae6591b7334f09cbc4ad19ec674d2fc8..f67bc575af40a99b1c0e961682b73825db239d91 100644 (file)
--- a/runtime/Completion.cpp
+++ b/runtime/Completion.cpp
@@ -26,6 +26,7 @@
 #include "CallFrame.h"
 #include "CodeProfiling.h"
 #include "Debugger.h"
 #include "CallFrame.h"
 #include "CodeProfiling.h"
 #include "Debugger.h"

+#include "Exception.h"

 #include "Interpreter.h"
 #include "JSGlobalObject.h"
 #include "JSLock.h"
 #include "Interpreter.h"
 #include "JSGlobalObject.h"
 #include "JSLock.h"


@@ -55,11 +56,12 @@ bool checkSyntax(VM& vm, const SourceCode& source, ParserError& error)
 {
     JSLockHolder lock(vm);
     RELEASE_ASSERT(vm.atomicStringTable() == wtfThreadData().atomicStringTable());
 {
     JSLockHolder lock(vm);
     RELEASE_ASSERT(vm.atomicStringTable() == wtfThreadData().atomicStringTable());

-    RefPtr<ProgramNode> programNode = parse<ProgramNode>(&vm, source, 0, Identifier(), JSParseNormal, JSParseProgramCode, error);
-    return programNode;
+    return !!parse<ProgramNode>(
+        &vm, source, 0, Identifier(), JSParserBuiltinMode::NotBuiltin, 
+        JSParserStrictMode::NotStrict, JSParserCodeType::Program, error);

 }
 
 }
 

-JSValue evaluate(ExecState* exec, const SourceCode& source, JSValue thisValue, JSValue* returnedException)
+JSValue evaluate(ExecState* exec, const SourceCode& source, JSValue thisValue, NakedPtr<Exception>& returnedException)

 {
     JSLockHolder lock(exec);
     RELEASE_ASSERT(exec->vm().atomicStringTable() == wtfThreadData().atomicStringTable());
 {
     JSLockHolder lock(exec);
     RELEASE_ASSERT(exec->vm().atomicStringTable() == wtfThreadData().atomicStringTable());


@@ -69,9 +71,7 @@ JSValue evaluate(ExecState* exec, const SourceCode& source, JSValue thisValue, J
 
     ProgramExecutable* program = ProgramExecutable::create(exec, source);
     if (!program) {
 
     ProgramExecutable* program = ProgramExecutable::create(exec, source);
     if (!program) {

-        if (returnedException)
-            *returnedException = exec->vm().exception();
-
+        returnedException = exec->vm().exception();

         exec->vm().clearException();
         return jsUndefined();
     }
         exec->vm().clearException();
         return jsUndefined();
     }


@@ -82,9 +82,7 @@ JSValue evaluate(ExecState* exec, const SourceCode& source, JSValue thisValue, J
     JSValue result = exec->interpreter()->execute(program, exec, thisObj);
 
     if (exec->hadException()) {
     JSValue result = exec->interpreter()->execute(program, exec, thisObj);
 
     if (exec->hadException()) {

-        if (returnedException)
-            *returnedException = exec->exception();
-
+        returnedException = exec->exception();

         exec->clearException();
         return jsUndefined();
     }
         exec->clearException();
         return jsUndefined();
     }