JavaScriptCore-1218.33.tar.gz

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

diff --git a/runtime/Completion.cpp b/runtime/Completion.cpp
index 2f88df95d8cd6d118dab96598eedb6dad7dd3285..a2d8a6b5fe77febf30c4ac330b2efbe3898737bd 100644 (file)
--- a/runtime/Completion.cpp
+++ b/runtime/Completion.cpp
@@ -24,49 +24,74 @@
 #include "Completion.h"
 
 #include "CallFrame.h"
 #include "Completion.h"
 
 #include "CallFrame.h"

+#include "CodeProfiling.h"
+#include "Debugger.h"
+#include "Interpreter.h"

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

-#include "Interpreter.h"
+#include "Operations.h"

 #include "Parser.h"
 #include "Parser.h"

-#include "Debugger.h"
+#include <wtf/WTFThreadData.h>

 #include <stdio.h>
 
 namespace JSC {
 
 #include <stdio.h>
 
 namespace JSC {
 

-Completion checkSyntax(ExecState* exec, const SourceCode& source)
+bool checkSyntax(ExecState* exec, const SourceCode& source, JSValue* returnedException)

 {
 {

-    JSLock lock(exec);
-    ASSERT(exec->globalData().identifierTable == currentIdentifierTable());
+    JSLockHolder lock(exec);
+    RELEASE_ASSERT(exec->vm().identifierTable == wtfThreadData().currentIdentifierTable());

 
 

-    RefPtr<ProgramExecutable> program = ProgramExecutable::create(exec, source);
+    ProgramExecutable* program = ProgramExecutable::create(exec, source);

     JSObject* error = program->checkSyntax(exec);
     JSObject* error = program->checkSyntax(exec);

-    if (error)
-        return Completion(Throw, error);
+    if (error) {
+        if (returnedException)
+            *returnedException = error;
+        return false;
+    }

 
 

-    return Completion(Normal);
+    return true;
+}
+    
+bool checkSyntax(VM& vm, const SourceCode& source, ParserError& error)
+{
+    JSLockHolder lock(vm);
+    RELEASE_ASSERT(vm.identifierTable == wtfThreadData().currentIdentifierTable());
+    RefPtr<ProgramNode> programNode = parse<ProgramNode>(&vm, source, 0, Identifier(), JSParseNormal, JSParseProgramCode, error);
+    return programNode;

 }
 
 }
 

-Completion evaluate(ExecState* exec, ScopeChain& scopeChain, const SourceCode& source, JSValue thisValue)
+JSValue evaluate(ExecState* exec, const SourceCode& source, JSValue thisValue, JSValue* returnedException)

 {
 {

-    JSLock lock(exec);
-    ASSERT(exec->globalData().identifierTable == currentIdentifierTable());
+    JSLockHolder lock(exec);
+    RELEASE_ASSERT(exec->vm().identifierTable == wtfThreadData().currentIdentifierTable());
+    RELEASE_ASSERT(!exec->vm().isCollectorBusy());
+
+    CodeProfiling profile(source);

 
 

-    RefPtr<ProgramExecutable> program = ProgramExecutable::create(exec, source);
-    JSObject* error = program->compile(exec, scopeChain.node());
-    if (error)
-        return Completion(Throw, error);
+    ProgramExecutable* program = ProgramExecutable::create(exec, source);
+    if (!program) {
+        if (returnedException)
+            *returnedException = exec->vm().exception;

 
 

-    JSObject* thisObj = (!thisValue || thisValue.isUndefinedOrNull()) ? exec->dynamicGlobalObject() : thisValue.toObject(exec);
+        exec->vm().exception = JSValue();
+        return jsUndefined();
+    }

 
 

-    JSValue exception;
-    JSValue result = exec->interpreter()->execute(program.get(), exec, scopeChain.node(), thisObj, &exception);
+    if (!thisValue || thisValue.isUndefinedOrNull())
+        thisValue = exec->dynamicGlobalObject();
+    JSObject* thisObj = thisValue.toThisObject(exec);
+    JSValue result = exec->interpreter()->execute(program, exec, thisObj);

 
 

-    if (exception) {
-        if (exception.isObject() && asObject(exception)->isWatchdogException())
-            return Completion(Interrupted, exception);
-        return Completion(Throw, exception);
+    if (exec->hadException()) {
+        if (returnedException)
+            *returnedException = exec->exception();
+
+        exec->clearException();
+        return jsUndefined();

     }
     }

-    return Completion(Normal, result);
+
+    RELEASE_ASSERT(result);
+    return result;

 }
 
 } // namespace JSC
 }
 
 } // namespace JSC