/// 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.
+/// Chess960 mode. Instead internally Move is coded as "king captures rook".
const string move_to_uci(Move m, bool chess960) {
if (m == MOVE_NULL)
return "0000";
- if (move_is_short_castle(m) && !chess960)
- return from == SQ_E1 ? "e1g1" : "e8g8";
-
- if (move_is_long_castle(m) && !chess960)
- return from == SQ_E1 ? "e1c1" : "e8c8";
+ if (move_is_castle(m) && !chess960)
+ to = from + (square_file(to) == FILE_H ? Square(2) : -Square(2));
if (move_is_promotion(m))
promotion = char(tolower(piece_type_to_char(promotion_piece_type(m))));
Move move_from_uci(const Position& pos, const string& str) {
- MoveStack mlist[MAX_MOVES];
- MoveStack* last = generate<MV_LEGAL>(pos, mlist);
-
- for (MoveStack* cur = mlist; cur != last; cur++)
- if (str == move_to_uci(cur->move, pos.is_chess960()))
- return cur->move;
+ for (MoveList<MV_LEGAL> ml(pos); !ml.end(); ++ml)
+ if (str == move_to_uci(ml.move(), pos.is_chess960()))
+ return ml.move();
return MOVE_NONE;
}
/// move_to_san() takes a position and a move as input, where it is assumed
-/// that the move is a legal move from the position. The return value is
+/// that the move is a legal move for the position. The return value is
/// a string containing the move in short algebraic notation.
const string move_to_san(Position& pos, Move m) {
+ if (m == MOVE_NONE)
+ return "(none)";
+
+ if (m == MOVE_NULL)
+ return "(null)";
+
assert(pos.is_ok());
assert(move_is_ok(m));
bool ambiguousMove, ambiguousFile, ambiguousRank;
Square sq, from = move_from(m);
Square to = move_to(m);
- PieceType pt = type_of_piece(pos.piece_on(from));
+ PieceType pt = piece_type(pos.piece_on(from));
string san;
- if (m == MOVE_NONE)
- return "(none)";
-
- if (m == MOVE_NULL)
- return "(null)";
-
- if (move_is_long_castle(m))
- san = "O-O-O";
- else if (move_is_short_castle(m))
- san = "O-O";
+ if (move_is_castle(m))
+ san = (move_to(m) < move_from(m) ? "O-O-O" : "O-O");
else
{
if (pt != PAWN)