/*
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
- Copyright (C) 2008-2010 Marco Costalba, Joona Kiiski, Tord Romstad
+ Copyright (C) 2008-2012 Marco Costalba, Joona Kiiski, Tord Romstad
Stockfish is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
*/
#include <cassert>
-#include <cstring>
#include <string>
#include "movegen.h"
const string move_to_uci(Move m, bool chess960) {
- Square from = move_from(m);
- Square to = move_to(m);
+ Square from = from_sq(m);
+ Square to = to_sq(m);
string promotion;
if (m == MOVE_NONE)
to = from + (file_of(to) == FILE_H ? Square(2) : -Square(2));
if (is_promotion(m))
- promotion = char(tolower(piece_type_to_char(promotion_piece_type(m))));
+ promotion = char(tolower(piece_type_to_char(promotion_type(m))));
return square_to_string(from) + square_to_string(to) + promotion;
}
Bitboard attackers;
bool ambiguousMove, ambiguousFile, ambiguousRank;
- Square sq, from = move_from(m);
- Square to = move_to(m);
- PieceType pt = type_of(pos.piece_on(from));
+ Square sq, from = from_sq(m);
+ Square to = to_sq(m);
+ PieceType pt = type_of(pos.piece_moved(m));
string san;
if (is_castle(m))
- san = (move_to(m) < move_from(m) ? "O-O-O" : "O-O");
+ san = (to_sq(m) < from_sq(m) ? "O-O-O" : "O-O");
else
{
if (pt != PAWN)
// Disambiguation if we have more then one piece with destination 'to'
// note that for pawns is not needed because starting file is explicit.
- attackers = pos.attackers_to(to) & pos.pieces(pt, pos.side_to_move());
- clear_bit(&attackers, from);
+ attackers = pos.attackers_to(to) & pos.pieces(pos.side_to_move(), pt);
+ attackers ^= from;
ambiguousMove = ambiguousFile = ambiguousRank = false;
while (attackers)
{
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 (is_promotion(m))
{
san += '=';
- san += piece_type_to_char(promotion_piece_type(m));
+ san += piece_type_to_char(promotion_type(m));
}
}
- // The move gives check? We don't use pos.move_gives_check() here
- // because we need to test for a mate after the move is done.
- StateInfo st;
- pos.do_move(m, st);
- if (pos.in_check())
- san += pos.is_mate() ? "#" : "+";
- pos.undo_move(m);
+ if (pos.move_gives_check(m, CheckInfo(pos)))
+ {
+ StateInfo st;
+ pos.do_move(m, st);
+ san += MoveList<MV_LEGAL>(pos).size() ? "+" : "#";
+ pos.undo_move(m);
+ }
return san;
}