Changeset 40663 in webkit

Timestamp:

Feb 4, 2009 9:31:40 PM (15 years ago)

Author:

barraclough@apple.com

Message:

2009-02-04 Gavin Barraclough <​barraclough@apple.com>

Reviewed by Oliver 'the nun' Hunt.

Add -e switch to jsc to enable evaluation of scripts passed on the command line.

• jsc.cpp: (Script::Script): (runWithScripts): (printUsageStatement): (parseArguments): (jscmain):

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• jsc.cpp (modified) (8 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2009-02-04  Gavin Barraclough  <barraclough@apple.com>
+
+        Reviewed by Oliver 'the nun' Hunt.
+
+        Add -e switch to jsc to enable evaluation of scripts passed on the command line.
+
+        * jsc.cpp:
+        (Script::Script):
+        (runWithScripts):
+        (printUsageStatement):
+        (parseArguments):
+        (jscmain):
+
 2009-02-04  Gavin Barraclough  <barraclough@apple.com>
 

trunk/JavaScriptCore/jsc.cpp

@@ -77 +77 @@
 static NO_RETURN JSValuePtr functionQuit(ExecState*, JSObject*, JSValuePtr, const ArgList&);
 
+struct Script {
+    bool isFile;
+    char *argument;
+    
+    Script(bool isFile, char *argument)
+        : isFile(isFile)
+        , argument(argument)
+    {
+    }
+};
+
 struct Options {
     Options()
@@ -86 +97 @@
     bool interactive;
     bool dump;
-    Vector<UString> fileNames;
+    Vector<Script> scripts;
     Vector<UString> arguments;
 };
@@ -312 +323 @@
 }
 
-static bool runWithScripts(GlobalObject* globalObject, const Vector<UString>& fileNames, bool dump)
-{
-    Vector<char> script;
+static bool runWithScripts(GlobalObject* globalObject, const Vector<Script>& scripts, bool dump)
+{
+    UString script;
+    UString fileName;
+    Vector<char> scriptBuffer;
 
     if (dump)
@@ -325 +338 @@
 
     bool success = true;
-    for (size_t i = 0; i < fileNames.size(); i++) {
-        UString fileName = fileNames[i];
-
-        if (!fillBufferWithContentsOfFile(fileName, script))
-            return false; // fail early so we can catch missing files
+    for (size_t i = 0; i < scripts.size(); i++) {
+        if (scripts[i].isFile) {
+            fileName = scripts[i].argument;
+            if (!fillBufferWithContentsOfFile(fileName, scriptBuffer))
+                return false; // fail early so we can catch missing files
+            script = scriptBuffer.data();
+        } else {
+            script = scripts[i].argument;
+            fileName = "[Command Line]";
+        }
 
 #if ENABLE(OPCODE_SAMPLING)
         interpreter->sampler()->start();
 #endif
-        Completion completion = evaluate(globalObject->globalExec(), globalObject->globalScopeChain(), makeSource(script.data(), fileName));
+        Completion completion = evaluate(globalObject->globalExec(), globalObject->globalScopeChain(), makeSource(script, fileName));
         success = success && completion.complType() != Throw;
         if (dump) {
@@ -391 +409 @@
 }
 
-static NO_RETURN void printUsageStatement()
+static NO_RETURN void printUsageStatement(bool help = false)
 {
     fprintf(stderr, "Usage: jsc [options] [files] [-- arguments]\n");
     fprintf(stderr, "  -d         Dumps bytecode (debug builds only)\n");
+    fprintf(stderr, "  -e         Evaluate argument as script code\n");
     fprintf(stderr, "  -f         Specifies a source file (deprecated)\n");
     fprintf(stderr, "  -h|--help  Prints this help message\n");
     fprintf(stderr, "  -i         Enables interactive mode (default if no files are specified)\n");
     fprintf(stderr, "  -s         Installs signal handlers that exit on a crash (Unix platforms only)\n");
-    exit(EXIT_FAILURE);
+    exit(help ? EXIT_SUCCESS : EXIT_FAILURE);
 }
 
@@ -410 +429 @@
             if (++i == argc)
                 printUsageStatement();
-            options.fileNames.append(argv[i]);
+            options.scripts.append(Script(true, argv[i]));
             continue;
         }
+        if (strcmp(arg, "-e") == 0) {
+            if (++i == argc)
+                printUsageStatement();
+            options.scripts.append(Script(false, argv[i]));
+            continue;
+        }
         if (strcmp(arg, "-h") == 0 || strcmp(arg, "--help") == 0) {
-            printUsageStatement();
+            printUsageStatement(true);
         }
         if (strcmp(arg, "-i") == 0) {
@@ -437 +462 @@
             break;
         }
-        options.fileNames.append(argv[i]);
+        options.scripts.append(Script(true, argv[i]));
     }
     
-    if (options.fileNames.isEmpty())
+    if (options.scripts.isEmpty())
         options.interactive = true;
     
@@ -455 +480 @@
 
     GlobalObject* globalObject = new (globalData) GlobalObject(options.arguments);
-    bool success = runWithScripts(globalObject, options.fileNames, options.dump);
+    bool success = runWithScripts(globalObject, options.scripts, options.dump);
     if (options.interactive && success)
         runInteractive(globalObject);