Changeset 34437 in webkit for trunk/JavaScriptCore

Timestamp:

Jun 7, 2008, 8:50:33 PM (17 years ago)

Author:

[email protected]

Message:

2008-06-07 Cameron Zwarich <​[email protected]>

Reviewed by Dan Bernstein.

Bug 17928: testkjs shouldn't require "-f"
<​https://bugs.webkit.org/show_bug.cgi?id=17928>

• kjs/testkjs.cpp: (printUsageStatement): (parseArguments):

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• kjs/testkjs.cpp (modified) (3 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2008-06-07  Cameron Zwarich  <[email protected]>
+
+        Reviewed by Dan Bernstein.
+
+        Bug 17928: testkjs shouldn't require "-f"
+        <https://bugs.webkit.org/show_bug.cgi?id=17928>
+
+        * kjs/testkjs.cpp:
+        (printUsageStatement):
+        (parseArguments):
+
 2008-06-07  Cameron Zwarich  <[email protected]>
 

trunk/JavaScriptCore/kjs/testkjs.cpp

@@ -327 +327 @@
 static void printUsageStatement()
 {
-    fprintf(stderr, "Usage: testkjs -f file1 [-f file2...][-p][-- arguments...]\n");
+    fprintf(stderr, "Usage: testkjs [options] [files] [-- arguments]\n");
+    fprintf(stderr, "  -f  Specifies a source file (deprecated)\n");
+    fprintf(stderr, "  -p  Prints formatted source code\n");
+    fprintf(stderr, "  -d  Dumps bytecode (debug builds only)\n");
+    fprintf(stderr, "  -s  Installs signal handlers that exit on a crash (Unix platforms only)\n");
     exit(-1);
 }
@@ -333 +337 @@
 static void parseArguments(int argc, char** argv, Vector<UString>& fileNames, Vector<UString>& arguments, bool& prettyPrint, bool& dump)
 {
-    if (argc < 3)
+    if (argc < 2)
         printUsageStatement();
 
@@ -366 +370 @@
             break;
         }
-        break;
-    }
-
+        fileNames.append(argv[i]);
+    }
+    
+    if (fileNames.isEmpty())
+        printUsageStatement();
+    
     for (; i < argc; ++i)
         arguments.append(argv[i]);