Small touches in set_option()

No functional change.

Signed-off-by: Marco Costalba <mcostalba@gmail.com>

diff --git a/src/uci.cpp b/src/uci.cpp
index 673d661878a7b1b12ea687c9f9f9909bc355b227..e6f01d3c72670a24da0f7ed22c5c48651d264fec 100644 (file)
--- a/src/uci.cpp
+++ b/src/uci.cpp
@@ -59,7 +59,7 @@ bool execute_uci_command(const string& cmd) {
   UCIParser up(cmd);
   string token;
 
   UCIParser up(cmd);
   string token;
 

-  up >> token; // operator>>() skips any whitespace
+  up >> skipws >> token;

 
   if (token == "quit")
       return false;
 
   if (token == "quit")
       return false;


@@ -123,7 +123,7 @@ namespace {
     Move m;
     string token, fen;
 
     Move m;
     string token, fen;
 

-    up >> token; // operator>>() skips any whitespace
+    up >> token;

 
     if (token == "startpos")
     {
 
     if (token == "startpos")
     {


@@ -151,24 +151,20 @@ namespace {
 
   void set_option(UCIParser& up) {
 
 
   void set_option(UCIParser& up) {
 

-    string token, name;
-    string value = "true"; // UCI buttons don't have a "value" field
+    string token, name, value;

 
     up >> token; // Consume "name" token
 
     up >> token; // Consume "name" token

-    up >> name;  // Read option name

 
 

-    // Handle names with included spaces
+    // Read option name (can contain spaces)

     while (up >> token && token != "value")
     while (up >> token && token != "value")

-        name += " " + token;
+        name += string(" ", !name.empty()) + token;

 
 

-    up >> value; // Read option value
-
-    // Handle values with included spaces
+    // Read option value (can contain spaces)

     while (up >> token)
     while (up >> token)

-        value += " " + token;
+        value += string(" ", !value.empty()) + token;

 
     if (Options.find(name) != Options.end())
 
     if (Options.find(name) != Options.end())

-        Options[name].set_value(value);
+        Options[name].set_value(value.empty() ? "true" : value); // UCI buttons don't have "value"

     else
         cout << "No such option: " << name << endl;
   }
     else
         cout << "No such option: " << name << endl;
   }