Changeset 33979 in webkit for trunk/JavaScriptCore/kjs/interpreter.cpp

Timestamp:

May 21, 2008, 6:20:45 PM (17 years ago)

Author:

[email protected]

Message:

Merge squirrelfish branch into trunk.

File:

• trunk/JavaScriptCore/kjs/interpreter.cpp (modified) (5 diffs)

trunk/JavaScriptCore/kjs/interpreter.cpp

@@ -26 +26 @@
 #include "ExecState.h"
 #include "JSGlobalObject.h"
+#include "Machine.h"
 #include "Parser.h"
 #include "debugger.h"
@@ -39 +40 @@
 Completion Interpreter::checkSyntax(ExecState* exec, const UString& sourceURL, int startingLineNumber, const UString& code)
 {
-    return checkSyntax(exec, sourceURL, startingLineNumber, code.data(), code.size());
+    return checkSyntax(exec, sourceURL, startingLineNumber, UStringSourceProvider::create(code));
 }
 
-Completion Interpreter::checkSyntax(ExecState* exec, const UString& sourceURL, int startingLineNumber, const UChar* code, int codeLength)
+Completion Interpreter::checkSyntax(ExecState* exec, const UString& sourceURL, int startingLineNumber, PassRefPtr<SourceProvider> source)
 {
     JSLock lock;
@@ -48 +49 @@
     int errLine;
     UString errMsg;
-    RefPtr<ProgramNode> progNode = parser().parse<ProgramNode>(sourceURL, startingLineNumber, code, codeLength, 0, &errLine, &errMsg);
+
+    RefPtr<ProgramNode> progNode = parser().parse<ProgramNode>(exec, sourceURL, startingLineNumber, source, 0, &errLine, &errMsg);
     if (!progNode)
         return Completion(Throw, Error::create(exec, SyntaxError, errMsg, errLine, 0, sourceURL));
@@ -54 +56 @@
 }
 
-Completion Interpreter::evaluate(ExecState* exec, const UString& sourceURL, int startingLineNumber, const UString& code, JSValue* thisV)
+Completion Interpreter::evaluate(ExecState* exec, ScopeChain& scopeChain, const UString& sourceURL, int startingLineNumber, const UString& code, JSValue* thisV)
 {
-    return evaluate(exec, sourceURL, startingLineNumber, code.data(), code.size(), thisV);
+    return evaluate(exec, scopeChain, sourceURL, startingLineNumber, UStringSourceProvider::create(code), thisV);
 }
 
-Completion Interpreter::evaluate(ExecState* exec, const UString& sourceURL, int startingLineNumber, const UChar* code, int codeLength, JSValue* thisV)
+Completion Interpreter::evaluate(ExecState* exec, ScopeChain& scopeChain, const UString& sourceURL, int startingLineNumber, PassRefPtr<SourceProvider> source, JSValue* thisValue)
 {
     JSLock lock;
-    
-    JSGlobalObject* globalObject = exec->dynamicGlobalObject();
-
-    if (globalObject->recursion() >= 20)
-        return Completion(Throw, Error::create(exec, GeneralError, "Recursion too deep"));
     
     // parse the source code
@@ -77 +74 @@
 #endif
 
-    RefPtr<ProgramNode> progNode = parser().parse<ProgramNode>(sourceURL, startingLineNumber, code, codeLength, &sourceId, &errLine, &errMsg);
-    
-    // notify debugger that source has been parsed
-    if (globalObject->debugger()) {
-        bool cont = globalObject->debugger()->sourceParsed(exec, sourceId, sourceURL, UString(code, codeLength), startingLineNumber, errLine, errMsg);
-        if (!cont)
-            return Completion(Break);
-    }
-    
+    RefPtr<ProgramNode> programNode = parser().parse<ProgramNode>(exec, sourceURL, startingLineNumber, source, &sourceId, &errLine, &errMsg);
+
     // no program node means a syntax error occurred
-    if (!progNode)
+    if (!programNode)
         return Completion(Throw, Error::create(exec, SyntaxError, errMsg, errLine, sourceId, sourceURL));
-    
-    exec->clearException();
-    
-    globalObject->incRecursion();
-    
-    JSObject* thisObj = globalObject;
-    
-    // "this" must be an object... use same rules as Function.prototype.apply()
-    if (thisV && !thisV->isUndefinedOrNull())
-        thisObj = thisV->toObject(exec);
-    
-    Completion res;
-    if (exec->hadException())
-        // the thisV->toObject() conversion above might have thrown an exception - if so, propagate it
-        res = Completion(Throw, exec->exception());
-    else {
-        // execute the code
-        InterpreterExecState newExec(globalObject, thisObj, progNode.get());
-        JSValue* value = progNode->execute(&newExec);
-        res = Completion(newExec.completionType(), value);
-    }
+
+    JSObject* thisObj = (!thisValue || thisValue->isUndefinedOrNull()) ? exec->dynamicGlobalObject() : thisValue->toObject(exec);
+
+    JSValue* exception = 0;
+    JSValue* result = machine().execute(programNode.get(), exec, scopeChain.node(), thisObj, &exec->dynamicGlobalObject()->registerFileStack(), &exception);
 
 #if JAVASCRIPT_PROFILING
-        Profiler::profiler()->didExecute(exec, sourceURL, startingLineNumber);
+    Profiler::profiler()->didExecute(exec, sourceURL, startingLineNumber);
 #endif
 
-    globalObject->decRecursion();
-    
-    if (shouldPrintExceptions() && res.complType() == Throw) {
-        JSLock lock;
-        ExecState* exec = globalObject->globalExec();
-        CString f = sourceURL.UTF8String();
-        CString message = res.value()->toObject(exec)->toString(exec).UTF8String();
-        int line = res.value()->toObject(exec)->get(exec, "line")->toUInt32(exec);
-#if PLATFORM(WIN_OS)
-        printf("%s line %d: %s\n", f.c_str(), line, message.c_str());
-#else
-        printf("[%d] %s line %d: %s\n", getpid(), f.c_str(), line, message.c_str());
-#endif
-    }
-
-    return res;
+    return exception ? Completion(Throw, exception) : Completion(Normal, result);
 }