Changeset 33979 in webkit for trunk/JavaScriptCore/kjs/testkjs.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/testkjs.cpp (modified) (9 diffs)

trunk/JavaScriptCore/kjs/testkjs.cpp

@@ -23 +23 @@
 #include "config.h"
 
+#include "CodeGenerator.h"
 #include "JSGlobalObject.h"
 #include "JSLock.h"
@@ -184 +185 @@
         return throwError(exec, GeneralError, "Could not open file.");
 
+    JSGlobalObject* globalObject = exec->dynamicGlobalObject();
+
     stopWatch.start();
-    Interpreter::evaluate(exec->dynamicGlobalObject()->globalExec(), fileName, 0, script.data());
+    Interpreter::evaluate(globalObject->globalExec(), globalObject->globalScopeChain(), fileName, 0, script.data());
     stopWatch.stop();
 
@@ -198 +201 @@
         return throwError(exec, GeneralError, "Could not open file.");
 
-    Interpreter::evaluate(exec->dynamicGlobalObject()->globalExec(), fileName, 0, script.data());
+    JSGlobalObject* globalObject = exec->dynamicGlobalObject();
+    Interpreter::evaluate(globalObject->globalExec(), globalObject->globalScopeChain(), fileName, 0, script.data());
 
     return jsUndefined();
@@ -259 +263 @@
 }
 
-static bool prettyPrintScript(const UString& fileName, const Vector<char>& script)
+static bool prettyPrintScript(ExecState* exec, const UString& fileName, const Vector<char>& script)
 {
     int errLine = 0;
     UString errMsg;
     UString scriptUString(script.data());
-    RefPtr<ProgramNode> programNode = parser().parse<ProgramNode>(fileName, 0, scriptUString.data(), scriptUString.size(), 0, &errLine, &errMsg);
+    RefPtr<ProgramNode> programNode = parser().parse<ProgramNode>(exec, fileName, 0, UStringSourceProvider::create(scriptUString), 0, &errLine, &errMsg);
     if (!programNode) {
         fprintf(stderr, "%s:%d: %s.\n", fileName.UTF8String().c_str(), errLine, errMsg.UTF8String().c_str());
@@ -274 +278 @@
 }
 
-static bool runWithScripts(const Vector<UString>& fileNames, Vector<UString>& arguments, bool prettyPrint)
+static bool runWithScripts(const Vector<UString>& fileNames, Vector<UString>& arguments, bool prettyPrint, bool dump)
 {
     GlobalObject* globalObject = new GlobalObject(arguments);
     Vector<char> script;
 
+    if (dump)
+        CodeGenerator::setDumpsGeneratedCode(true);
+
     bool success = true;
 
@@ -288 +295 @@
 
         if (prettyPrint)
-            prettyPrintScript(fileName, script);
+            prettyPrintScript(globalObject->globalExec(), fileName, script);
         else {
-            Completion completion = Interpreter::evaluate(globalObject->globalExec(), fileName, 0, script.data());
+            Completion completion = Interpreter::evaluate(globalObject->globalExec(), globalObject->globalScopeChain(), fileName, 0, script.data());
             success = success && completion.complType() != Throw;
+            if (dump) {
+                if (success)
+                    printf("End: %s\n", completion.value()->toString(globalObject->globalExec()).ascii());
+                else
+                    printf("Exception: %s\n", completion.value()->toString(globalObject->globalExec()).ascii());
+            }
         }
     }
@@ -303 +316 @@
 }
 
-static void parseArguments(int argc, char** argv, Vector<UString>& fileNames, Vector<UString>& arguments, bool& prettyPrint)
+static void parseArguments(int argc, char** argv, Vector<UString>& fileNames, Vector<UString>& arguments, bool& prettyPrint, bool& dump)
 {
     if (argc < 3)
@@ -321 +334 @@
             continue;
         }
+        if (strcmp(arg, "-d") == 0) {
+            dump = true;
+            continue;
+        }
+        if (strcmp(arg, "-s") == 0) {
+#if PLATFORM(UNIX)
+            signal(SIGILL, _exit);
+            signal(SIGFPE, _exit);
+            signal(SIGBUS, _exit);
+            signal(SIGSEGV, _exit);
+#endif
+            continue;
+        }
         if (strcmp(arg, "--") == 0) {
             ++i;
@@ -339 +365 @@
 
     bool prettyPrint = false;
+    bool dump = false;
     Vector<UString> fileNames;
     Vector<UString> arguments;
-    parseArguments(argc, argv, fileNames, arguments, prettyPrint);
-
-    bool success = runWithScripts(fileNames, arguments, prettyPrint);
+    parseArguments(argc, argv, fileNames, arguments, prettyPrint, dump);
+
+    bool success = runWithScripts(fileNames, arguments, prettyPrint, dump);
 
 #ifndef NDEBUG