Changeset 30553 in webkit for trunk/JavaScriptCore/kjs/testkjs.cpp

Timestamp:

Feb 24, 2008, 5:34:09 PM (17 years ago)

Author:

[email protected]

Message:

Reviewed by Oliver Hunt and Mark Rowe.

​http://bugs.webkit.org/show_bug.cgi?id=17505
Add support for getting command line arguments in testkjs

• This slightly changes the behavior of parsing arguments by requiring a '-f' before all files.

• kjs/testkjs.cpp: (createGlobalObject): Add a global property called 'arguments' which contains an array with the parsed arguments as strings. (runWithScripts): Pass in the arguments vector so that it can be passed to the global object. (parseArguments): Change parsing rules to require a '-f' before any script file. After all '-f' and '-p' arguments have been parsed, the remaining are added to the arguments vector and exposed to the script. If there is a chance of ambiguity (the user wants to pass the string '-f' to the script), the string '--' can be used separate the options from the pass through arguments. (kjsmain):

File:

• trunk/JavaScriptCore/kjs/testkjs.cpp (modified) (6 diffs)

trunk/JavaScriptCore/kjs/testkjs.cpp

@@ -27 +27 @@
 #include "JSLock.h"
 #include "Parser.h"
+#include "array_object.h"
 #include "collector.h"
 #include "interpreter.h"
@@ -223 +224 @@
 }
 
-static GlobalImp* createGlobalObject()
+static GlobalImp* createGlobalObject(Vector<UString>& arguments)
 {
   GlobalImp* global = new GlobalImp;
@@ -240 +241 @@
   global->put(global->globalExec(), "load", new TestFunctionImp(TestFunctionImp::Load, 1));
 
+  JSObject* array = global->arrayConstructor()->construct(global->globalExec(), global->globalExec()->emptyList());
+  for (size_t i = 0; i < arguments.size(); ++i)
+    array->put(global->globalExec(), i, jsString(arguments[i]));
+  global->put(global->globalExec(), "arguments", array);
+
   Interpreter::setShouldPrintExceptions(true);
   return global;
@@ -259 +265 @@
 }
 
-static bool runWithScripts(const Vector<UString>& fileNames, bool prettyPrint)
-{
-  GlobalImp* globalObject = createGlobalObject();
+static bool runWithScripts(const Vector<UString>& fileNames, Vector<UString>& arguments, bool prettyPrint)
+{
+  GlobalImp* globalObject = createGlobalObject(arguments);
   Vector<char> script;
   
@@ -282 +288 @@
 }
 
-static void parseArguments(int argc, char** argv, Vector<UString>& fileNames, bool& prettyPrint)
-{
-  if (argc < 2) {
-    fprintf(stderr, "Usage: testkjs file1 [file2...]\n");
+static void printUsageStatement()
+{
+    fprintf(stderr, "Usage: testkjs -f file1 [-f file2...][-p][-- arguments...]\n");
     exit(-1);
-  }
-  
-  for (int i = 1; i < argc; i++) {
-    const char* fileName = argv[i];
-    if (strcmp(fileName, "-f") == 0) // mozilla test driver script uses "-f" prefix for files
+}
+
+static void parseArguments(int argc, char** argv, Vector<UString>& fileNames, Vector<UString>& arguments, bool& prettyPrint)
+{
+  if (argc < 3)
+    printUsageStatement();
+
+  int i = 1;
+  for (; i < argc; ++i) {
+    const char* arg = argv[i];
+    if (strcmp(arg, "-f") == 0) {
+      if (++i == argc)
+        printUsageStatement();
+      fileNames.append(argv[i]);
       continue;
-    if (strcmp(fileName, "-p") == 0) {
+    }
+    if (strcmp(arg, "-p") == 0) {
       prettyPrint = true;
       continue;
     }
-    fileNames.append(fileName);
-  }
+    if (strcmp(arg, "--") == 0) {
+      ++i;
+      break;
+    }
+    break;
+  }
+
+  for (; i < argc; ++i)
+    arguments.append(argv[i]);
 }
 
@@ -307 +329 @@
   bool prettyPrint = false;
   Vector<UString> fileNames;
-  parseArguments(argc, argv, fileNames, prettyPrint);
-  
-  bool success = runWithScripts(fileNames, prettyPrint);
+  Vector<UString> arguments;
+  parseArguments(argc, argv, fileNames, arguments, prettyPrint);
+  
+  bool success = runWithScripts(fileNames, arguments, prettyPrint);
 
 #ifndef NDEBUG