Move argument parsing into its own function

Author: hannes-steffenhagen-diffblue

src/util/cmdline.cpp

@@ -156,55 +156,7 @@ bool cmdlinet::parse(int argc, const char **argv, const char *optstring)
   clear();
 
   parse_optstring(optstring);
-
-  for(int i=1; i<argc; i++)
-  {
-    if(argv[i][0]!='-')
-      args.push_back(argv[i]);
-    else
-    {
-      optionalt<std::size_t> optnr;
-
-      if(argv[i][1]!=0 && argv[i][2]==0)
-        optnr=getoptnr(argv[i][1]); // single-letter option -X
-      else if(argv[i][1]=='-')
-        optnr=getoptnr(argv[i]+2); // multi-letter option with --XXX
-      else
-      {
-        // Multi-letter option -XXX, or single-letter with argument -Xval
-        // We first try single-letter.
-        optnr=getoptnr(argv[i][1]);
-
-        if(!optnr.has_value()) // try multi-letter
-          optnr=getoptnr(argv[i]+1);
-      }
-
-      if(!optnr.has_value())
-      {
-        unknown_arg=argv[i];
-        return true;
-      }
-
-      options[*optnr].isset=true;
-
-      if(options[*optnr].hasval)
-      {
-        if(argv[i][2]==0 || options[*optnr].islong)
-        {
-          i++;
-          if(i==argc)
-            return true;
-          if(argv[i][0]=='-' && argv[i][1]!=0)
-            return true;
-          options[*optnr].values.push_back(argv[i]);
-        }
-        else
-          options[*optnr].values.push_back(argv[i]+2);
-      }
-    }
-  }
-
-  return false;
+  return parse_arguments(argc, argv);
 }
 
 cmdlinet::option_namest cmdlinet::option_names() const
@@ -315,6 +267,57 @@ cmdlinet::get_argument_suggestions(const std::string &unknown_argument)
   return final_suggestions;
 }
 
+bool cmdlinet::parse_arguments(int argc, const char **argv)
+{
+  for(int i = 1; i < argc; i++)
+  {
+    if(argv[i][0] != '-')
+      args.push_back(argv[i]);
+    else
+    {
+      optionalt<std::size_t> optnr;
+
+      if(argv[i][1] != 0 && argv[i][2] == 0)
+        optnr = getoptnr(argv[i][1]); // single-letter option -X
+      else if(argv[i][1] == '-')
+        optnr = getoptnr(argv[i] + 2); // multi-letter option with --XXX
+      else
+      {
+        // Multi-letter option -XXX, or single-letter with argument -Xval
+        // We first try single-letter.
+        optnr = getoptnr(argv[i][1]);
+
+        if(!optnr.has_value()) // try multi-letter
+          optnr = getoptnr(argv[i] + 1);
+      }
+
+      if(!optnr.has_value())
+      {
+        unknown_arg = argv[i];
+        return true;
+      }
+
+      options[*optnr].isset = true;
+
+      if(options[*optnr].hasval)
+      {
+        if(argv[i][2] == 0 || options[*optnr].islong)
+        {
+          i++;
+          if(i == argc)
+            return true;
+          if(argv[i][0] == '-' && argv[i][1] != 0)
+            return true;
+          options[*optnr].values.push_back(argv[i]);
+        }
+        else
+          options[*optnr].values.push_back(argv[i] + 2);
+      }
+    }
+  }
+  return false;
+}
+
 cmdlinet::option_namest::option_names_iteratort::option_names_iteratort(
   const cmdlinet *command_line,
   std::size_t index)

src/util/cmdline.h

@@ -116,6 +116,7 @@ class cmdlinet
   };
 
   void parse_optstring(const char *optstring);
+  bool parse_arguments(int argc, const char **argv);
 
   std::vector<optiont> options;