kate/BadFish
1
0
Fork 0
mirror of https://github.com/sockspls/badfish synced 2025-07-11 11:39:15 +00:00
Code Issues Releases Wiki Activity

Retire uci_main_loop()

Browse source 
No functional change.

Signed-off-by: Marco Costalba <mcostalba@gmail.com>
This commit is contained in:
Marco Costalba 2010-12-13 11:17:06 +01:00
parent 2d63f2157e
commit 6afcfd00f2
2 changed files with 96 additions and 116 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/main.cpp
View file

@ -46,7 +46,7 @@
using namespace std;
extern void uci_main_loop();
extern bool execute_uci_command(const string& cmd);
extern void benchmark(int argc, char* argv[]);
////
@ -83,8 +83,18 @@ int main(int argc, char* argv[]) {
if (CpuHasPOPCNT)
cout << "Good! CPU has hardware POPCNT." << endl;
// Enter UCI mode
uci_main_loop();
// Wait for a command from the user, and passes this command to
// execute_uci_command() and also intercepts EOF from stdin, by
// translating EOF to the "quit" command. This ensures that we
// exit gracefully if the GUI dies unexpectedly.
string cmd;
do {
// Wait for a command from stdin
if (!getline(cin, cmd))
cmd = "quit";
} while (execute_uci_command(cmd));
}
else // Process command line arguments
{

74
src/uci.cpp
View file

@ -38,9 +38,6 @@
using namespace std;
////
//// Local definitions:
////
namespace {
@ -52,7 +49,6 @@ namespace {
typedef istringstream UCIParser;
// Local functions
bool handle_command(Position& pos, const string& command);
void set_option(UCIParser& uip);
void set_position(Position& pos, UCIParser& uip);
bool go(Position& pos, UCIParser& uip);
@ -60,46 +56,15 @@ namespace {
}
////
//// Functions
////
/// execute_uci_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.
/// uci_main_loop() is the only global function in this file. It is
/// 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,
/// by translating EOF to the "quit" command. This ensures that Stockfish
/// exits gracefully if the GUI dies unexpectedly.
bool execute_uci_command(const string& cmd) {
void uci_main_loop() {
Position pos(StartPositionFEN, 0); // The root position
string command;
do {
// Wait for a command from stdin
if (!getline(cin, command))
command = "quit";
} while (handle_command(pos, command));
}
////
//// Local functions
////
namespace {
// 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) {
UCIParser up(command);
static Position pos(StartPositionFEN, 0); // The root position
UCIParser up(cmd);
string token;
if (!(up >> token)) // operator>>() skips any whitespace
@ -155,12 +120,18 @@ namespace {
perft(pos, up);
else
cout << "Unknown command: " << command << endl;
cout << "Unknown command: " << cmd << endl;
return true;
}
////
//// Local functions
////
namespace {
// set_position() is called when Stockfish receives the "position" UCI
// command. The input parameter is a UCIParser. It is assumed
// that this parser has consumed the first token of the UCI command
@ -171,12 +142,16 @@ namespace {
string token;
if (!(up >> token)) // operator>>() skips any whitespace
if (!(up >> token) || (token != "startpos" && token != "fen"))
return;
if (token == "startpos")
{
pos.from_fen(StartPositionFEN);
else if (token == "fen")
if (!(up >> token))
return;
}
else // fen
{
string fen;
while (up >> token && token != "moves")
@ -187,13 +162,10 @@ namespace {
pos.from_fen(fen);
}
if (up.good())
{
if (token != "moves")
up >> token;
return;
if (token == "moves")
{
// Parse optional move list
Move move;
StateInfo st;
while (up >> token)
@ -209,8 +181,6 @@ namespace {
// its content inside pos before it disappears.
pos.detach();
}
}
}
// set_option() is called when Stockfish receives the "setoption" UCI