Simplify set_option()

[stockfish] / src / uci.cpp

diff --git a/src/uci.cpp b/src/uci.cpp
index c1073ad596831fafbb2750c8402b7b07d6515cc7..826ecd12e1ad694c2988719f3bc46b0e85ed20fc 100644 (file)
--- a/src/uci.cpp
+++ b/src/uci.cpp
@@ -140,42 +140,27 @@ namespace {
 
   void set_position(Position& pos, UCIParser& up) {
 
-    string token;
+    string fen, token;
 
-    if (!(up >> token) || (token != "startpos" && token != "fen"))
-        return;
+    up >> token; // operator>>() skips any whitespace
 
     if (token == "startpos")
     {
         pos.from_fen(StartPositionFEN, false);
-        if (!(up >> token))
-            return;
+        up >> token; // Consume "moves" token
     }
-    else // fen
+    else if (token == "fen")
     {
-        string fen;
         while (up >> token && token != "moves")
-        {
-            fen += token;
-            fen += ' ';
-        }
+            fen += token + " ";
+
         pos.from_fen(fen, Options["UCI_Chess960"].value<bool>());
     }
+    else return;
 
-    if (token != "moves")
-        return;
-
-    // Parse optional move list
-    Move move;
-    StateInfo st;
+    // Parse move list (if any)
     while (up >> token)
-    {
-        move = move_from_uci(pos, token);
-        pos.do_setup_move(move, st);
-    }
-    // Our StateInfo st is about going out of scope so copy
-    // its content inside pos before it disappears.
-    pos.detach();
+        pos.do_setup_move(move_from_uci(pos, token));
   }
 
 
@@ -187,39 +172,26 @@ namespace {
 
   void set_option(UCIParser& up) {
 
-    string token, name, value;
+    string value = "true"; // UCI buttons don't have a "value" field
+    string token, name;
 
-    if (!(up >> token) || token != "name") // operator>>() skips any whitespace
-        return;
-
-    if (!(up >> name))
-        return;
+    up >> token; // Consume "name" token
+    up >> name;  // Read option name
 
     // Handle names with included spaces
     while (up >> token && token != "value")
-        name += (" " + token);
+        name += " " + token;
 
-    if (Options.find(name) == Options.end())
-    {
-        cout << "No such option: " << name << endl;
-        return;
-    }
-
-    // Is a button ?
-    if (token != "value")
-    {
-        Options[name].set_value("true");
-        return;
-    }
-
-    if (!(up >> value))
-        return;
+    up >> value; // Read option value
 
     // Handle values with included spaces
     while (up >> token)
-        value += (" " + token);
+        value += " " + token;
 
-    Options[name].set_value(value);
+    if (Options.find(name) != Options.end())
+        Options[name].set_value(value);
+    else
+        cout << "No such option: " << name << endl;
   }