No functional change.
Signed-off-by: Marco Costalba <mcostalba@gmail.com>
// FEN string for the initial position
const string StartPositionFEN = "rnbqkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBQKBNR w KQkq - 0 1";
// FEN string for the initial position
const string StartPositionFEN = "rnbqkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBQKBNR w KQkq - 0 1";
- // UCIInputParser is a class for parsing UCI input. The class
+ // UCIParser is a class for parsing UCI input. The class
// is actually a string stream built on a given input string.
// is actually a string stream built on a given input string.
- typedef istringstream UCIInputParser;
+ typedef istringstream UCIParser;
// Local functions
bool handle_command(Position& pos, const string& command);
// Local functions
bool handle_command(Position& pos, const string& command);
- void set_option(UCIInputParser& uip);
- void set_position(Position& pos, UCIInputParser& uip);
- bool go(Position& pos, UCIInputParser& uip);
- void perft(Position& pos, UCIInputParser& uip);
+ void set_option(UCIParser& uip);
+ void set_position(Position& pos, UCIParser& uip);
+ bool go(Position& pos, UCIParser& uip);
+ void perft(Position& pos, UCIParser& uip);
/// called immediately after the program has finished initializing.
/// The program remains in this loop until it receives the "quit" UCI
/// command. It waits for a command from the user, and passes this
/// called immediately after the program has finished initializing.
/// The program remains in this loop until it receives the "quit" UCI
/// command. It waits for a command from the user, and passes this
-/// command to handle_command and also intercepts EOF from stdin,
+/// command to handle_command() and also intercepts EOF from stdin,
/// by translating EOF to the "quit" command. This ensures that Stockfish
/// exits gracefully if the GUI dies unexpectedly.
/// by translating EOF to the "quit" command. This ensures that Stockfish
/// exits gracefully if the GUI dies unexpectedly.
- // handle_command() takes a text string as input, uses a
- // UCIInputParser object to parse this text string as a UCI command,
- // and calls the appropriate functions. In addition to the UCI
- // commands, the function also supports a few debug commands.
+ // handle_command() takes a string as input, uses a UCIParser
+ // object to parse this text string as a UCI command, and calls
+ // the appropriate functions. In addition to the UCI commands,
+ // the function also supports a few debug commands.
bool handle_command(Position& pos, const string& command) {
bool handle_command(Position& pos, const string& command) {
- UCIInputParser uip(command);
- if (!(uip >> token)) // operator>>() skips any whitespace
+ if (!(up >> token)) // operator>>() skips any whitespace
return true;
if (token == "quit")
return false;
if (token == "go")
return true;
if (token == "quit")
return false;
if (token == "go")
}
else if (token == "ucinewgame")
pos.from_fen(StartPositionFEN);
}
else if (token == "ucinewgame")
pos.from_fen(StartPositionFEN);
else if (token == "isready")
cout << "readyok" << endl;
else if (token == "isready")
cout << "readyok" << endl;
else if (token == "position")
else if (token == "position")
- set_position(pos, uip);
+ set_position(pos, up);
+
else if (token == "setoption")
else if (token == "setoption")
- // The remaining commands are for debugging purposes only.
- // Perhaps they should be removed later in order to reduce the
- // size of the program binary.
+ // The remaining commands are for debugging purposes only
else if (token == "d")
pos.print();
else if (token == "d")
pos.print();
else if (token == "flip")
{
Position p(pos, pos.thread());
else if (token == "flip")
{
Position p(pos, pos.thread());
cout << "key: " << hex << pos.get_key()
<< "\nmaterial key: " << pos.get_material_key()
<< "\npawn key: " << pos.get_pawn_key() << endl;
cout << "key: " << hex << pos.get_key()
<< "\nmaterial key: " << pos.get_material_key()
<< "\npawn key: " << pos.get_pawn_key() << endl;
else if (token == "perft")
else if (token == "perft")
else
cout << "Unknown command: " << command << endl;
else
cout << "Unknown command: " << command << endl;
// set_position() is called when Stockfish receives the "position" UCI
// set_position() is called when Stockfish receives the "position" UCI
- // command. The input parameter is a UCIInputParser. It is assumed
+ // command. The input parameter is a UCIParser. It is assumed
// that this parser has consumed the first token of the UCI command
// ("position"), and is ready to read the second token ("startpos"
// or "fen", if the input is well-formed).
// that this parser has consumed the first token of the UCI command
// ("position"), and is ready to read the second token ("startpos"
// or "fen", if the input is well-formed).
- void set_position(Position& pos, UCIInputParser& uip) {
+ void set_position(Position& pos, UCIParser& up) {
- if (!(uip >> token)) // operator>>() skips any whitespace
+ if (!(up >> token)) // operator>>() skips any whitespace
return;
if (token == "startpos")
return;
if (token == "startpos")
else if (token == "fen")
{
string fen;
else if (token == "fen")
{
string fen;
- while (uip >> token && token != "moves")
+ while (up >> token && token != "moves")
{
fen += token;
fen += ' ';
{
fen += token;
fen += ' ';
if (token == "moves")
{
Move move;
StateInfo st;
if (token == "moves")
{
Move move;
StateInfo st;
{
move = move_from_uci(pos, token);
pos.do_move(move, st);
{
move = move_from_uci(pos, token);
pos.do_move(move, st);
// set_option() is called when Stockfish receives the "setoption" UCI
// set_option() is called when Stockfish receives the "setoption" UCI
- // command. The input parameter is a UCIInputParser. It is assumed
+ // command. The input parameter is a UCIParser. It is assumed
// that this parser has consumed the first token of the UCI command
// ("setoption"), and is ready to read the second token ("name", if
// the input is well-formed).
// that this parser has consumed the first token of the UCI command
// ("setoption"), and is ready to read the second token ("name", if
// the input is well-formed).
- void set_option(UCIInputParser& uip) {
+ void set_option(UCIParser& up) {
string token, name, value;
string token, name, value;
- if (!(uip >> token)) // operator>>() skips any whitespace
+ if (!(up >> token) || token != "name") // operator>>() skips any whitespace
- if (token != "name" || !(uip >> name))
- while (uip >> token && token != "value")
+ // Handle names with included spaces
+ while (up >> token && token != "value")
name += (" " + token);
if (Options.find(name) == Options.end())
name += (" " + token);
if (Options.find(name) == Options.end())
- if (token != "value" || !(uip >> value))
+ // Is a button ?
+ if (token != "value")
{
Options[name].set_value("true");
return;
}
{
Options[name].set_value("true");
return;
}
+ if (!(up >> value))
+ return;
+
+ // Handle values with included spaces
+ while (up >> token)
value += (" " + token);
Options[name].set_value(value);
value += (" " + token);
Options[name].set_value(value);
// go() is called when Stockfish receives the "go" UCI command. The
// go() is called when Stockfish receives the "go" UCI command. The
- // input parameter is a UCIInputParser. It is assumed that this
+ // input parameter is a UCIParser. It is assumed that this
// parser has consumed the first token of the UCI command ("go"),
// and is ready to read the second token. The function sets the
// thinking time and other parameters from the input string, and
// parser has consumed the first token of the UCI command ("go"),
// and is ready to read the second token. The function sets the
// thinking time and other parameters from the input string, and
// parameters. Returns false if a quit command is received while
// thinking, returns true otherwise.
// parameters. Returns false if a quit command is received while
// thinking, returns true otherwise.
- bool go(Position& pos, UCIInputParser& uip) {
+ bool go(Position& pos, UCIParser& up) {
searchMoves[0] = MOVE_NONE;
searchMoves[0] = MOVE_NONE;
{
if (token == "infinite")
infinite = true;
else if (token == "ponder")
ponder = true;
else if (token == "wtime")
{
if (token == "infinite")
infinite = true;
else if (token == "ponder")
ponder = true;
else if (token == "wtime")
else if (token == "btime")
else if (token == "btime")
else if (token == "winc")
else if (token == "winc")
else if (token == "binc")
else if (token == "binc")
else if (token == "movestogo")
else if (token == "movestogo")
else if (token == "depth")
else if (token == "depth")
else if (token == "nodes")
else if (token == "nodes")
else if (token == "movetime")
else if (token == "movetime")
else if (token == "searchmoves")
{
int numOfMoves = 0;
else if (token == "searchmoves")
{
int numOfMoves = 0;
searchMoves[numOfMoves++] = move_from_uci(pos, token);
searchMoves[numOfMoves] = MOVE_NONE;
searchMoves[numOfMoves++] = move_from_uci(pos, token);
searchMoves[numOfMoves] = MOVE_NONE;
depth, nodes, moveTime, searchMoves);
}
depth, nodes, moveTime, searchMoves);
}
- void perft(Position& pos, UCIInputParser& uip) {
+ void perft(Position& pos, UCIParser& up) {
return;
tm = get_system_time();
return;
tm = get_system_time();