deepcrayon
/
stockfish
1
0
Fork 0
Code Releases Activity

Small cleanup in uci.cpp 

No functional change.

Signed-off-by: Marco Costalba <mcostalba@gmail.com>
sf_2.3.1_base
Marco Costalba 2010-12-13 09:48:12 +01:00
parent 56de5ae561
commit 2d63f2157e
1 changed files with 60 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

111
src/uci.cpp
View File

@ -47,16 +47,16 @@ namespace {
// 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.
typedef istringstream UCIInputParser;
typedef istringstream UCIParser;
// 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);
}
@ -68,7 +68,7 @@ namespace {
/// 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.
@ -92,24 +92,24 @@ void uci_main_loop() {
namespace {
// 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) {
UCIInputParser uip(command);
UCIParser up(command);
string token;
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 go(pos, uip);
return go(pos, up);
if (token == "uci")
{
@ -120,18 +120,20 @@ namespace {
}
else if (token == "ucinewgame")
pos.from_fen(StartPositionFEN);
else if (token == "isready")
cout << "readyok" << endl;
else if (token == "position")
set_position(pos, uip);
else if (token == "setoption")
set_option(uip);
// The remaining commands are for debugging purposes only.
// Perhaps they should be removed later in order to reduce the
// size of the program binary.
else if (token == "position")
set_position(pos, up);
else if (token == "setoption")
set_option(up);
// The remaining commands are for debugging purposes only
else if (token == "d")
pos.print();
else if (token == "flip")
{
Position p(pos, pos.thread());
@ -148,8 +150,10 @@ namespace {
cout << "key: " << hex << pos.get_key()
<< "\nmaterial key: " << pos.get_material_key()
<< "\npawn key: " << pos.get_pawn_key() << endl;
else if (token == "perft")
perft(pos, uip);
perft(pos, up);
else
cout << "Unknown command: " << command << endl;
@ -158,16 +162,16 @@ namespace {
// 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).
void set_position(Position& pos, UCIInputParser& uip) {
void set_position(Position& pos, UCIParser& up) {
string token;
if (!(uip >> token)) // operator>>() skips any whitespace
if (!(up >> token)) // operator>>() skips any whitespace
return;
if (token == "startpos")
@ -175,7 +179,7 @@ namespace {
else if (token == "fen")
{
string fen;
while (uip >> token && token != "moves")
while (up >> token && token != "moves")
{
fen += token;
fen += ' ';
@ -183,16 +187,16 @@ namespace {
pos.from_fen(fen);
}
if (uip.good())
if (up.good())
{
if (token != "moves")
uip >> token;
up >> token;
if (token == "moves")
{
Move move;
StateInfo st;
while (uip >> token)
while (up >> token)
{
move = move_from_uci(pos, token);
pos.do_move(move, st);
@ -210,22 +214,23 @@ namespace {
// 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).
void set_option(UCIInputParser& uip) {
void set_option(UCIParser& up) {
string token, name, value;
if (!(uip >> token)) // operator>>() skips any whitespace
if (!(up >> token) || token != "name") // operator>>() skips any whitespace
return;
if (token != "name" || !(uip >> name))
if (!(up >> name))
return;
while (uip >> token && token != "value")
// Handle names with included spaces
while (up >> token && token != "value")
name += (" " + token);
if (Options.find(name) == Options.end())
@ -234,13 +239,18 @@ namespace {
return;
}
if (token != "value" || !(uip >> value))
// Is a button ?
if (token != "value")
{
Options[name].set_value("true");
return;
}
while (uip >> token)
if (!(up >> value))
return;
// Handle values with included spaces
while (up >> token)
value += (" " + token);
Options[name].set_value(value);
@ -248,7 +258,7 @@ namespace {
// 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
@ -256,7 +266,7 @@ namespace {
// 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) {
string token;
@ -267,32 +277,32 @@ namespace {
searchMoves[0] = MOVE_NONE;
while (uip >> token)
while (up >> token)
{
if (token == "infinite")
infinite = true;
else if (token == "ponder")
ponder = true;
else if (token == "wtime")
uip >> time[0];
up >> time[0];
else if (token == "btime")
uip >> time[1];
up >> time[1];
else if (token == "winc")
uip >> inc[0];
up >> inc[0];
else if (token == "binc")
uip >> inc[1];
up >> inc[1];
else if (token == "movestogo")
uip >> movesToGo;
up >> movesToGo;
else if (token == "depth")
uip >> depth;
up >> depth;
else if (token == "nodes")
uip >> nodes;
up >> nodes;
else if (token == "movetime")
uip >> moveTime;
up >> moveTime;
else if (token == "searchmoves")
{
int numOfMoves = 0;
while (uip >> token)
while (up >> token)
searchMoves[numOfMoves++] = move_from_uci(pos, token);
searchMoves[numOfMoves] = MOVE_NONE;
@ -305,12 +315,11 @@ namespace {
depth, nodes, moveTime, searchMoves);
}
void perft(Position& pos, UCIInputParser& uip) {
void perft(Position& pos, UCIParser& up) {
string token;
int depth, tm, n;
if (!(uip >> depth))
if (!(up >> depth))
return;
tm = get_system_time();