It is misnamed because it is not a parser, perhaps a
tokenizer, anyhow better call it for what it is, an
input string stream.
No functional change.
Signed-off-by: Marco Costalba <mcostalba@gmail.com>
// where, due to 50 moves rule, we need to check at most 100 plies back.
StateInfo StateRingBuf[102], *SetupState = StateRingBuf;
// where, due to 50 moves rule, we need to check at most 100 plies back.
StateInfo StateRingBuf[102], *SetupState = StateRingBuf;
- // UCIParser is a class for parsing UCI input. The class
- // is actually a string stream built on a given input string.
- typedef istringstream UCIParser;
-
- void set_option(UCIParser& up);
- void set_position(Position& pos, UCIParser& up);
- bool go(Position& pos, UCIParser& up);
- void perft(Position& pos, UCIParser& up);
+ void set_option(istringstream& up);
+ void set_position(Position& pos, istringstream& up);
+ bool go(Position& pos, istringstream& up);
+ void perft(Position& pos, istringstream& up);
-/// 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.
+/// execute_uci_command() takes a string as input, parses this text string as
+/// an UCI command, and calls the appropriate functions. In addition to the
+/// UCI commands, the function also supports a few debug commands.
bool execute_uci_command(const string& cmd) {
static Position pos(StartPositionFEN, false, 0); // The root position
bool execute_uci_command(const string& cmd) {
static Position pos(StartPositionFEN, false, 0); // The root position
if (token == "quit")
return false;
if (token == "go")
if (token == "quit")
return false;
if (token == "go")
if (token == "ucinewgame")
pos.from_fen(StartPositionFEN, false);
if (token == "ucinewgame")
pos.from_fen(StartPositionFEN, false);
cout << "readyok" << endl;
else if (token == "position")
cout << "readyok" << endl;
else if (token == "position")
else if (token == "setoption")
else if (token == "setoption")
else if (token == "perft")
else if (token == "perft")
else if (token == "d")
pos.print();
else if (token == "d")
pos.print();
// fen string ("fen") or the starting position ("startpos") and then
// makes the moves given in the following move list ("moves").
// 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, UCIParser& up) {
+ void set_position(Position& pos, istringstream& is) {
Move m;
string token, fen;
Move m;
string token, fen;
if (token == "startpos")
{
if (token == "startpos")
{
- pos.from_fen(StartPositionFEN, false);
- up >> token; // Consume "moves" token if any
+ fen = StartPositionFEN;
+ is >> token; // Consume "moves" token if any
}
else if (token == "fen")
}
else if (token == "fen")
- {
- while (up >> token && token != "moves")
+ while (is >> token && token != "moves")
- pos.from_fen(fen, Options["UCI_Chess960"].value<bool>());
- }
- else return;
+ pos.from_fen(fen, Options["UCI_Chess960"].value<bool>());
// Parse move list (if any)
// Parse move list (if any)
- while (up >> token && (m = move_from_uci(pos, token)) != MOVE_NONE)
+ while (is >> token && (m = move_from_uci(pos, token)) != MOVE_NONE)
{
pos.do_move(m, *SetupState);
{
pos.do_move(m, *SetupState);
// command. The function updates the corresponding UCI option ("name")
// to the given value ("value").
// command. The function updates the corresponding UCI option ("name")
// to the given value ("value").
- void set_option(UCIParser& up) {
+ void set_option(istringstream& is) {
string token, name, value;
string token, name, value;
- up >> token; // Consume "name" token
+ is >> token; // Consume "name" token
// Read option name (can contain spaces)
// Read option name (can contain spaces)
- while (up >> token && token != "value")
+ while (is >> token && token != "value")
name += string(" ", !name.empty()) + token;
// Read option value (can contain spaces)
name += string(" ", !name.empty()) + token;
// Read option value (can contain spaces)
value += string(" ", !value.empty()) + token;
if (Options.find(name) != Options.end())
value += string(" ", !value.empty()) + token;
if (Options.find(name) != Options.end())
// string, and then calls think(). Returns false if a quit command
// is received while thinking, true otherwise.
// string, and then calls think(). Returns false if a quit command
// is received while thinking, true otherwise.
- bool go(Position& pos, UCIParser& up) {
+ bool go(Position& pos, istringstream& is) {
string token;
SearchLimits limits;
std::vector<Move> searchMoves;
int time[] = { 0, 0 }, inc[] = { 0, 0 };
string token;
SearchLimits limits;
std::vector<Move> searchMoves;
int time[] = { 0, 0 }, inc[] = { 0, 0 };
{
if (token == "infinite")
limits.infinite = true;
else if (token == "ponder")
limits.ponder = true;
else if (token == "wtime")
{
if (token == "infinite")
limits.infinite = true;
else if (token == "ponder")
limits.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")
- up >> limits.movesToGo;
+ is >> limits.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")
else if (token == "searchmoves")
searchMoves.push_back(move_from_uci(pos, token));
}
searchMoves.push_back(move_from_uci(pos, token));
}
// The function calls perft() passing the required search depth
// then prints counted leaf nodes and elapsed time.
// The function calls perft() passing the required search depth
// then prints counted leaf nodes and elapsed time.
- void perft(Position& pos, UCIParser& up) {
+ void perft(Position& pos, istringstream& is) {
int depth, time;
int64_t n;
int depth, time;
int64_t n;
return;
time = get_system_time();
return;
time = get_system_time();