* Added d8 flag "--" (alias "--js-arguments").

src/flags.cc

 // Copyright 2006-2008 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 30 matching lines @@
 // Define all of our flags default values.
 #define FLAG_MODE_DEFINE_DEFAULTS
 #include "flag-definitions.h"
 
 namespace {
 
 // This structure represents a single entry in the flag system, with a pointer
 // to the actual flag, default value, comment, etc.  This is designed to be POD
 // initialized as to avoid requiring static constructors.
 struct Flag {
-  enum FlagType { TYPE_BOOL, TYPE_INT, TYPE_FLOAT, TYPE_STRING };
+  enum FlagType { TYPE_BOOL, TYPE_INT, TYPE_FLOAT, TYPE_STRING, TYPE_ARGS };
 
   FlagType type_;           // What type of flag, bool, int, or string.
   const char* name_;        // Name of the flag, ex "my_flag".
   void* valptr_;            // Pointer to the global flag variable.
   const void* defptr_;      // Pointer to the default value.
   const char* cmt_;         // A comment about the flags purpose.
 
   FlagType type() const { return type_; }
 
   const char* name() const { return name_; }
@@ skipping 13 matching lines @@
   double* float_variable() const {
     ASSERT(type_ == TYPE_FLOAT);
     return reinterpret_cast<double*>(valptr_);
   }
 
   const char** string_variable() const {
     ASSERT(type_ == TYPE_STRING);
     return reinterpret_cast<const char**>(valptr_);
   }
 
+  JSArguments* args_variable() const {
+    ASSERT(type_ == TYPE_ARGS);
+    return reinterpret_cast<JSArguments*>(valptr_);
+  }
+
   bool bool_default() const {
     ASSERT(type_ == TYPE_BOOL);
     return *reinterpret_cast<const bool*>(defptr_);
   }
 
   int int_default() const {
     ASSERT(type_ == TYPE_INT);
     return *reinterpret_cast<const int*>(defptr_);
   }
 
   double float_default() const {
     ASSERT(type_ == TYPE_FLOAT);
     return *reinterpret_cast<const double*>(defptr_);
   }
 
   const char* string_default() const {
     ASSERT(type_ == TYPE_STRING);
     return *reinterpret_cast<const char* const *>(defptr_);
   }
 
+  JSArguments args_default() const {
+    ASSERT(type_ == TYPE_ARGS);
+    return *reinterpret_cast<const JSArguments*>(defptr_);
+  }
+
   // Compare this flag's current value against the default.
   bool IsDefault() const {
     switch (type_) {
       case TYPE_BOOL:
         return *bool_variable() == bool_default();
       case TYPE_INT:
         return *int_variable() == int_default();
       case TYPE_FLOAT:
         return *float_variable() == float_default();
-      case TYPE_STRING:
+      case TYPE_STRING: {
         const char* str1 = *string_variable();
         const char* str2 = string_default();
         if (str2 == NULL) return str1 == NULL;
         if (str1 == NULL) return str2 == NULL;
         return strcmp(str1, str2) == 0;
+      }
+      case TYPE_ARGS:
+        return args_variable()->argc() == 0;
     }
     UNREACHABLE();
     return true;
   }
 
   // Set a flag back to it's default value.
   void Reset() {
     switch (type_) {
       case TYPE_BOOL:
         *bool_variable() = bool_default();
         break;
       case TYPE_INT:
         *int_variable() = int_default();
         break;
       case TYPE_FLOAT:
         *float_variable() = float_default();
         break;
       case TYPE_STRING:
         *string_variable() = string_default();
         break;
+      case TYPE_ARGS:
+        *args_variable() = args_default();
+        break;
     }
   }
 };
 
 Flag flags[] = {
 #define FLAG_MODE_META
 #include "flag-definitions.h"
 };
 
 const size_t num_flags = sizeof(flags) / sizeof(*flags);
 
 }  // namespace
 
 
 static const char* Type2String(Flag::FlagType type) {
   switch (type) {
     case Flag::TYPE_BOOL: return "bool";
     case Flag::TYPE_INT: return "int";
     case Flag::TYPE_FLOAT: return "float";
     case Flag::TYPE_STRING: return "string";
+    case Flag::TYPE_ARGS: return "arguments";
   }
   UNREACHABLE();
   return NULL;
 }
 
 
 static char* ToString(Flag* flag) {
   Vector<char> value;
   switch (flag->type()) {
     case Flag::TYPE_BOOL:
       value = Vector<char>::New(6);
       OS::SNPrintF(value, "%s", (*flag->bool_variable() ? "true" : "false"));
       break;
     case Flag::TYPE_INT:
       value = Vector<char>::New(12);
       OS::SNPrintF(value, "%d", *flag->int_variable());
       break;
     case Flag::TYPE_FLOAT:
       value = Vector<char>::New(20);
       OS::SNPrintF(value, "%f", *flag->float_variable());
       break;
-    case Flag::TYPE_STRING:
+    case Flag::TYPE_STRING: {
       const char* str = *flag->string_variable();
       if (str) {
         int length = strlen(str) + 1;
         value = Vector<char>::New(length);
         OS::SNPrintF(value, "%s", str);
       } else {
         value = Vector<char>::New(5);
         OS::SNPrintF(value, "NULL");
       }
       break;
+    }
+    case Flag::TYPE_ARGS: {
+      JSArguments args = *flag->args_variable();
+      if (args.argc() == 0) {
+        value = Vector<char>::New(0);
+        break;
+      }
+      int len = args.argc() - 1;
+      for (int i = 0; i < args.argc(); i++) {
+        len += strlen(args[i]);
+      }
+      value = Vector<char>::New(len);
+      for (int i = 0; i < args.argc(); i++) {
+        if (i > 0) {
+          OS::SNPrintF(value, " ");
+        }
+        OS::SNPrintF(value, "%s", args[i]);
+      }
+      break;
+    }
   }
   ASSERT(!value.is_empty());
   return value.start();
 }
 
 
 // static
 List<char *>* FlagList::argv() {
   List<char *>* args = new List<char*>(8);
   for (size_t i = 0; i < num_flags; ++i) {
@@ skipping 30 matching lines @@
                           const char** name,
                           const char** value,
                           bool* is_bool) {
   *name = NULL;
   *value = NULL;
   *is_bool = false;
 
   if (*arg == '-') {
     // find the begin of the flag name
     arg++;  // remove 1st '-'
-    if (*arg == '-')
+    if (*arg == '-') {
       arg++;  // remove 2nd '-'
+      if (arg[0] == '\0') {
+        const char* kJSArgumentsFlagName = "js_arguments";
+        *name = kJSArgumentsFlagName;
+        return;
+      }
+    }
     if (arg[0] == 'n' && arg[1] == 'o') {
       arg += 2;  // remove "no"
       *is_bool = true;
     }
     *name = arg;
 
     // find the end of the flag name
     while (*arg != '\0' && *arg != '=')
       arg++;
 
@@ skipping 63 matching lines @@
           // sense there.
           continue;
         } else {
           fprintf(stderr, "Error: unrecognized flag %s\n"
                   "Try --help for options\n", arg);
           return j;
         }
       }
 
       // if we still need a flag value, use the next argument if available
-      if (flag->type() != Flag::TYPE_BOOL && value == NULL) {
+      if (flag->type() != Flag::TYPE_BOOL &&
+          flag->type() != Flag::TYPE_ARGS &&
+          value == NULL) {
         if (i < *argc) {
           value = argv[i++];
         } else {
           fprintf(stderr, "Error: missing value for flag %s of type %s\n"
                   "Try --help for options\n",
                   arg, Type2String(flag->type()));
           return j;
         }
       }
 
       // set the flag
       char* endp = const_cast<char*>("");  // *endp is only read
       switch (flag->type()) {
         case Flag::TYPE_BOOL:
           *flag->bool_variable() = !is_bool;
           break;
         case Flag::TYPE_INT:
           *flag->int_variable() = strtol(value, &endp, 10);  // NOLINT
           break;
         case Flag::TYPE_FLOAT:
           *flag->float_variable() = strtod(value, &endp);
           break;
         case Flag::TYPE_STRING:
           *flag->string_variable() = value;
           break;
+        case Flag::TYPE_ARGS:
+          int start_pos = (value == NULL) ? i : i - 1;
+          int js_argc = *argc - start_pos;
+          const char** js_argv = new const char*[js_argc];
+          if (value != NULL) {
+            js_argv[0] = value;
+          }
+          for (int k = i; k < *argc; k++) {
+            js_argv[k - start_pos] = argv[k];
+          }
+          *flag->args_variable() = JSArguments(js_argc, js_argv);
+          i = *argc;  // Consume all arguments
+          break;
       }
 
       // handle errors
       if ((flag->type() == Flag::TYPE_BOOL && value != NULL) ||
           (flag->type() != Flag::TYPE_BOOL && is_bool) ||
           *endp != '\0') {
         fprintf(stderr, "Error: illegal value for flag %s of type %s\n"
                 "Try --help for options\n",
                 arg, Type2String(flag->type()));
         return j;
@@ skipping 104 matching lines @@
   printf("Options:\n");
   for (size_t i = 0; i < num_flags; ++i) {
     Flag* f = &flags[i];
     char* value = ToString(f);
     printf("  --%s (%s)\n        type: %s  default: %s\n",
            f->name(), f->comment(), Type2String(f->type()), value);
     DeleteArray(value);
   }
 }
 
+JSArguments::JSArguments()
+    : argc_(0), argv_(NULL) {}
+JSArguments::JSArguments(int argc, const char** argv)
+    : argc_(argc), argv_(argv) {}
+int JSArguments::argc() const { return argc_; }
+const char** JSArguments::argv() { return argv_; }
+const char*& JSArguments::operator[](int idx) { return argv_[idx]; }
+JSArguments& JSArguments::operator=(JSArguments args) {
+    argc_ = args.argc_;
+    argv_ = args.argv_;
+    return *this;
+}
+
+
 } }  // namespace v8::internal