Name functions along corresponding UCI commands

[stockfish] / src / uci.cpp

diff --git a/src/uci.cpp b/src/uci.cpp
index 3a33b9f4a07170828a9f55ac5af228a1aa930257..3bd3c1a531c91db0b7e3668728915defdd48c606 100644 (file)
--- a/src/uci.cpp
+++ b/src/uci.cpp
@@ -42,10 +42,9 @@ namespace {
   // Keep track of position keys along the setup moves (from start position to the
   // position just before to start searching). Needed by repetition draw detection.
   Search::StateStackPtr SetupStates;
-  Search::MovesVectPtr SetupMoves;
 
-  void set_option(istringstream& up);
-  void set_position(Position& pos, istringstream& up);
+  void setoption(istringstream& up);
+  void position(Position& pos, istringstream& up);
   void go(const Position& pos, istringstream& up);
 }
 
@@ -106,8 +105,8 @@ void UCI::loop(const string& args) {
 
       else if (token == "ucinewgame") TT.clear();
       else if (token == "go")         go(pos, is);
-      else if (token == "position")   set_position(pos, is);
-      else if (token == "setoption")  set_option(is);
+      else if (token == "position")   position(pos, is);
+      else if (token == "setoption")  setoption(is);
       else if (token == "flip")       pos.flip();
       else if (token == "bench")      benchmark(pos, is);
       else if (token == "d")          sync_cout << pos.pretty() << sync_endl;
@@ -124,12 +123,12 @@ void UCI::loop(const string& args) {
 
 namespace {
 
-  // set_position() is called when engine receives the "position" UCI command.
+  // position() is called when engine receives the "position" UCI command.
   // The function sets up the position described in the given fen string ("fen")
   // or the starting position ("startpos") and then makes the moves given in the
   // following move list ("moves").
 
-  void set_position(Position& pos, istringstream& is) {
+  void position(Position& pos, istringstream& is) {
 
     Move m;
     string token, fen;
@@ -149,23 +148,20 @@ namespace {
 
     pos.set(fen, Options["UCI_Chess960"], Threads.main_thread());
     SetupStates = Search::StateStackPtr(new std::stack<StateInfo>());
-    SetupMoves = Search::MovesVectPtr(new std::vector<Move>());
-    SetupMoves->reserve(200); // Try to avoid reallocations
 
     // Parse move list (if any)
     while (is >> token && (m = move_from_uci(pos, token)) != MOVE_NONE)
     {
-        SetupMoves->push_back(m);
         SetupStates->push(StateInfo());
         pos.do_move(m, SetupStates->top());
     }
   }
 
 
-  // set_option() is called when engine receives the "setoption" UCI command. The
+  // setoption() is called when engine receives the "setoption" UCI command. The
   // function updates the UCI option ("name") to the given value ("value").
 
-  void set_option(istringstream& is) {
+  void setoption(istringstream& is) {
 
     string token, name, value;
 
@@ -215,6 +211,6 @@ namespace {
         else if (token == "ponder")    limits.ponder = true;
     }
 
-    Threads.start_thinking(pos, limits, searchMoves, SetupStates, SetupMoves);
+    Threads.start_thinking(pos, limits, searchMoves, SetupStates);
   }
 }