Move args parsing to UCI::loop

This leaves a very clean main.cpp

No functional change.

src/main.cpp

@@ -18,7 +18,6 @@
 */
 
 #include <iostream>
-#include <string>
 
 #include "bitboard.h"
 #include "evaluate.h"
@@ -42,12 +41,7 @@ int main(int argc, char* argv[]) {
  Threads.init();
  TT.resize(Options["Hash"]);
 
- std::string args;
-
- for (int i = 1; i < argc; ++i)
- args += std::string(argv[i]) + " ";
-
- UCI::loop(args);
+ UCI::loop(argc, argv);
 
  Threads.exit();
 }

src/uci.cpp

@@ -143,13 +143,16 @@ namespace {
 /// that we exit gracefully if the GUI dies unexpectedly. In addition to the UCI
 /// commands, the function also supports a few debug commands.
 
-void UCI::loop(const string& args) {
+void UCI::loop(int argc, char* argv[]) {
 
  Position pos(StartFEN, false, Threads.main()); // The root position
- string token, cmd = args;
+ string token, cmd;
+
+ for (int i = 1; i < argc; ++i)
+ cmd += std::string(argv[i]) + " ";
 
  do {
- if (args.empty() && !getline(cin, cmd)) // Block here waiting for input
+ if (argc == 1 && !getline(cin, cmd)) // Block here waiting for input
  cmd = "quit";
 
  istringstream is(cmd);
@@ -208,7 +211,7 @@ void UCI::loop(const string& args) {
  else
  sync_cout << "Unknown command: " << cmd << sync_endl;
 
- } while (token != "quit" && args.empty()); // Args have one-shot behaviour
+ } while (token != "quit" && argc == 1); // Passed args have one-shot behaviour
 
  Threads.wait_for_think_finished(); // Cannot quit whilst the search is running
 }

src/ucioption.h

@@ -61,7 +61,7 @@ class Option {
 };
 
 void init(OptionsMap&);
-void loop(const std::string&);
+void loop(int argc, char* argv[]);
 
 } // namespace UCI