Added option --shell to D8 and updated the usage text.

Review URL: http://codereview.chromium.org/14192

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@998 ce2b1a6d-e550-0410-aec6-3dcde31c8c00

diff --git a/src/d8.cc b/src/d8.cc
index 164dd0689403e933294a82e6c0eebb368f4a870e..9e392f616efdf2875d670286dcac740f994e65d4 100644 (file)
--- a/src/d8.cc
+++ b/src/d8.cc
@@ -433,7 +433,9 @@ int Shell::Main(int argc, char* argv[]) {
   Context::Scope context_scope(evaluation_context_);
   for (int i = 1; i < argc; i++) {
     char* str = argv[i];
-    if (strcmp(str, "-f") == 0) {
+    if (strcmp(str, "--shell") == 0) {
+      run_shell = true;
+    } else if (strcmp(str, "-f") == 0) {
       // Ignore any -f flags for compatibility with other stand-alone
       // JavaScript engines.
       continue;

diff --git a/src/flags.cc b/src/flags.cc
index 48b4ef7438b4e3088a7f2366a0bd5977f7c385c4..cb461ee0cd7515ca63133505ee349bb56c19abc5 100644 (file)
--- a/src/flags.cc
+++ b/src/flags.cc
@@ -516,10 +516,11 @@ void FlagList::PrintHelp() {
   printf("  shell [options] file1 file2 ... filek\n");
   printf("    run JavaScript scripts in file1, file2, ..., filek\n");
   printf("  shell [options]\n");
-  printf("  shell [options] --shell\n");
-  printf("    run an interactive JavaScript shell");
-  printf("  d8 [options] file\n");
+  printf("  shell [options] --shell [file1 file2 ... filek]\n");
+  printf("    run an interactive JavaScript shell\n");
+  printf("  d8 [options] file1 file2 ... filek\n");
   printf("  d8 [options]\n");
+  printf("  d8 [options] --shell [file1 file2 ... filek]\n");
   printf("    run the new debugging shell\n\n");
   printf("Options:\n");
   for (size_t i = 0; i < num_flags; ++i) {