////
#include <cassert>
+#include <cctype>
#include <iostream>
#include <sstream>
#include <string>
#include "move.h"
#include "movegen.h"
#include "position.h"
-#include "san.h"
#include "search.h"
#include "ucioption.h"
typedef istringstream UCIParser;
// Local functions
- void set_option(UCIParser& uip);
- void set_position(Position& pos, UCIParser& uip);
- bool go(Position& pos, UCIParser& uip);
- void perft(Position& pos, UCIParser& uip);
+ void set_option(UCIParser& up);
+ void set_position(Position& pos, UCIParser& up);
+ bool go(Position& pos, UCIParser& up);
+ void perft(Position& pos, UCIParser& up);
}
bool execute_uci_command(const string& cmd) {
- static Position pos(StartPositionFEN, 0); // The root position
+ static Position pos(StartPositionFEN, false, 0); // The root position
UCIParser up(cmd);
string token;
cout << "uciok" << endl;
}
else if (token == "ucinewgame")
- pos.from_fen(StartPositionFEN);
+ pos.from_fen(StartPositionFEN, false);
else if (token == "isready")
cout << "readyok" << endl;
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);
- if (!(up >> token))
- return;
+ pos.from_fen(StartPositionFEN, false);
+ up >> token; // Consume "moves" token
}
- else // fen
+ else if (token == "fen")
{
- string fen;
while (up >> token && token != "moves")
- {
- fen += token;
- fen += ' ';
- }
- pos.from_fen(fen);
- }
+ fen += token + " ";
- if (token != "moves")
- return;
+ pos.from_fen(fen, Options["UCI_Chess960"].value<bool>());
+ }
+ else 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_move(move, st);
- if (pos.rule_50_counter() == 0)
- pos.reset_game_ply();
-
- pos.inc_startpos_ply_counter(); //FIXME: make from_fen to support this and rule50
- }
- // 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));
}
void set_option(UCIParser& up) {
- string token, name, value;
-
- if (!(up >> token) || token != "name") // operator>>() skips any whitespace
- return;
+ string value = "true"; // UCI buttons don't have a "value" field
+ string token, name;
- 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);
-
- if (Options.find(name) == Options.end())
- {
- cout << "No such option: " << name << endl;
- return;
- }
+ name += " " + token;
- // 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;
}
void perft(Position& pos, UCIParser& up) {
- int depth, tm, n;
+ int depth, tm;
+ int64_t n;
if (!(up >> depth))
return;