commit 0311fc5ed3a1e789dc2c09eb5c44849b5507f46a
author Luis Fernando Pino Duque <lpino@google.com> Mon Nov 21 13:20:50 2016 +0000
committer Dmitry Lomov <dslomov@google.com> Mon Nov 21 19:41:18 2016 +0000
tree 32dad2c046492c29a1feaa6f73548efc4985aa0f
parent 480a2cf4d3684ad9171077a279f1743192096d7b

Provide a SplitCommandLine method in the option processor
that takes a given command line args and splits it into the corresponding
{binary, startup_args, command, command_args}.

The purpose of this function is to help split the responsibilities
of the ParseOptions function by processing the startup options independently
(i.e. rc files detection and processing) from the command options.
This will be combined with ParseOptions in a subsequent CL.

--
MOS_MIGRATED_REVID=139773786

src/main/cpp/startup_options.cc

diff --git a/src/main/cpp/startup_options.cc b/src/main/cpp/startup_options.cc
index c4590b9..fd02628 100644
--- a/src/main/cpp/startup_options.cc
+++ b/src/main/cpp/startup_options.cc
@@ -61,8 +61,7 @@
     output_root = WorkspaceLayout::GetOutputRoot();
   }
 
-  string product_name_lower = product_name;
-  blaze_util::ToLower(&product_name_lower);
+  const string product_name_lower = GetLowercaseProductName();
   output_user_root = blaze_util::JoinPath(
       output_root, "_" + product_name_lower + "_" + GetUserName());
   // 3 hours (but only 15 seconds if used within a test)
@@ -81,7 +80,13 @@
 
 StartupOptions::~StartupOptions() {}
 
-bool StartupOptions::IsNullary(const string &arg) const {
+string StartupOptions::GetLowercaseProductName() const {
+  string lowercase_product_name = product_name;
+  blaze_util::ToLower(&lowercase_product_name);
+  return lowercase_product_name;
+}
+
+bool StartupOptions::IsNullary(const string& arg) const {
   for (string option : nullary_options) {
     if (GetNullaryOption(arg.c_str(), ("--" + option).c_str()) ||
         GetNullaryOption(arg.c_str(), ("--no" + option).c_str())) {
@@ -91,11 +96,15 @@
   return false;
 }
 
-bool StartupOptions::IsUnary(const string &arg,
-                             const string &next_arg) const {
+bool StartupOptions::IsUnary(const string& arg) const {
   for (string option : unary_options) {
-    if (GetUnaryOption(arg.c_str(), next_arg.c_str(),
-                       ("--" + option).c_str()) != NULL) {
+    // The second argument of GetUnaryOption is not relevant to determine
+    // whether the option is unary or not, hence we set it to the empty string
+    // by default.
+    //
+    // TODO(lpino): Improve GetUnaryOption to only require the arg and the
+    // option we are looking for.
+    if (GetUnaryOption(arg.c_str(), "", ("--" + option).c_str()) != NULL) {
       return true;
     }
   }