X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmove.cpp;h=41d1603771a7b4d7d29daa019c23667deff99272;hp=62ec7579659817cc6233700f0a44ea9c41f9b3f6;hb=9c7e2c8f9d3eba45c20529ad0624e6de10fc7b83;hpb=1b2af05ea69abffff432f7f20685e144bd24055e
diff --git a/src/move.cpp b/src/move.cpp
index 62ec7579..41d16037 100644
--- a/src/move.cpp
+++ b/src/move.cpp
@@ -17,7 +17,6 @@
along with this program. If not, see .
*/
-#include
#include
#include
@@ -27,9 +26,9 @@
using std::string;
/// move_to_uci() converts a move to a string in coordinate notation
-/// (g1f3, a7a8q, etc.). The only special case is castling moves, where we
-/// print in the e1g1 notation in normal chess mode, and in e1h1 notation in
-/// Chess960 mode. Instead internally Move is coded as "king captures rook".
+/// (g1f3, a7a8q, etc.). The only special case is castling moves, where we print
+/// in the e1g1 notation in normal chess mode, and in e1h1 notation in chess960
+/// mode. Internally castle moves are always coded as "king captures rook".
const string move_to_uci(Move m, bool chess960) {
@@ -44,7 +43,7 @@ const string move_to_uci(Move m, bool chess960) {
return "0000";
if (is_castle(m) && !chess960)
- to = from + (file_of(to) == FILE_H ? Square(2) : -Square(2));
+ to = make_square(to > from ? FILE_G : FILE_C, rank_of(from));
if (is_promotion(m))
promotion = char(tolower(piece_type_to_char(promotion_type(m))));
@@ -54,13 +53,12 @@ const string move_to_uci(Move m, bool chess960) {
/// move_from_uci() takes a position and a string representing a move in
-/// simple coordinate notation and returns an equivalent Move if any.
-/// Moves are guaranteed to be legal.
+/// simple coordinate notation and returns an equivalent legal Move if any.
-Move move_from_uci(const Position& pos, string str) {
+Move move_from_uci(const Position& pos, string& str) {
- // Some GUIs, like Junior, could send promotion in uppercase
- std::transform(str.begin(), str.end(), str.begin(), tolower);
+ if (str.length() == 5) // Junior could send promotion piece in uppercase
+ str[4] = char(tolower(str[4]));
for (MoveList ml(pos); !ml.end(); ++ml)
if (str == move_to_uci(ml.move(), pos.is_chess960()))
@@ -70,9 +68,8 @@ Move move_from_uci(const Position& pos, string str) {
}
-/// move_to_san() takes a position and a move as input, where it is assumed
-/// that the move is a legal move for the position. The return value is
-/// a string containing the move in short algebraic notation.
+/// move_to_san() takes a position and a legal Move as input and returns its
+/// short algebraic notation representation.
const string move_to_san(Position& pos, Move m) {
@@ -82,17 +79,17 @@ const string move_to_san(Position& pos, Move m) {
if (m == MOVE_NULL)
return "(null)";
- assert(is_ok(m));
+ assert(pos.move_is_legal(m));
Bitboard attackers;
bool ambiguousMove, ambiguousFile, ambiguousRank;
- Square sq, from = from_sq(m);
- Square to = to_sq(m);
- PieceType pt = type_of(pos.piece_moved(m));
string san;
+ Square from = from_sq(m);
+ Square to = to_sq(m);
+ PieceType pt = type_of(pos.piece_on(from));
if (is_castle(m))
- san = (to_sq(m) < from_sq(m) ? "O-O-O" : "O-O");
+ san = to_sq(m) < from_sq(m) ? "O-O-O" : "O-O";
else
{
if (pt != PAWN)
@@ -107,18 +104,14 @@ const string move_to_san(Position& pos, Move m) {
while (attackers)
{
- sq = pop_1st_bit(&attackers);
+ Square sq = pop_1st_bit(&attackers);
// Pinned pieces are not included in the possible sub-set
if (!pos.pl_move_is_legal(make_move(sq, to), pos.pinned_pieces()))
continue;
- if (file_of(sq) == file_of(from))
- ambiguousFile = true;
-
- if (rank_of(sq) == rank_of(from))
- ambiguousRank = true;
-
+ ambiguousFile |= file_of(sq) == file_of(from);
+ ambiguousRank |= rank_of(sq) == rank_of(from);
ambiguousMove = true;
}
@@ -126,8 +119,10 @@ const string move_to_san(Position& pos, Move m) {
{
if (!ambiguousFile)
san += file_to_char(file_of(from));
+
else if (!ambiguousRank)
san += rank_to_char(rank_of(from));
+
else
san += square_to_string(from);
}
@@ -144,10 +139,7 @@ const string move_to_san(Position& pos, Move m) {
san += square_to_string(to);
if (is_promotion(m))
- {
- san += '=';
- san += piece_type_to_char(promotion_type(m));
- }
+ san += string("=") + piece_type_to_char(promotion_type(m));
}
if (pos.move_gives_check(m, CheckInfo(pos)))