for (rsq = relative_square(c, SQ_A1); type_of(piece_on(rsq)) != ROOK; ++rsq) {}
else if (token >= 'A' && token <= 'H')
- rsq = File(token - 'A') | relative_rank(c, RANK_1);
+ rsq = make_square(File(token - 'A'), relative_rank(c, RANK_1));
else
continue;
if ( ((ss >> col) && (col >= 'a' && col <= 'h'))
&& ((ss >> row) && (row == '3' || row == '6')))
{
- st->epSquare = File(col - 'a') | Rank(row - '1');
+ st->epSquare = make_square(File(col - 'a'), Rank(row - '1'));
if (!(attackers_to(st->epSquare) & pieces(sideToMove, PAWN)))
st->epSquare = SQ_NONE;
int emptyCnt;
std::ostringstream ss;
- for (Rank rank = RANK_8; rank >= RANK_1; --rank)
+ for (Rank r = RANK_8; r >= RANK_1; --r)
{
- for (File file = FILE_A; file <= FILE_H; ++file)
+ for (File f = FILE_A; f <= FILE_H; ++f)
{
- for (emptyCnt = 0; file <= FILE_H && empty(file | rank); ++file)
+ for (emptyCnt = 0; f <= FILE_H && empty(make_square(f, r)); ++f)
++emptyCnt;
if (emptyCnt)
ss << emptyCnt;
- if (file <= FILE_H)
- ss << PieceToChar[piece_on(file | rank)];
+ if (f <= FILE_H)
+ ss << PieceToChar[piece_on(make_square(f, r))];
}
- if (rank > RANK_1)
+ if (r > RANK_1)
ss << '/';
}
/// Position::pretty() returns an ASCII representation of the position to be
/// printed to the standard output together with the move's san notation.
-const string Position::pretty(Move move) const {
+const string Position::pretty(Move m) const {
const string dottedLine = "\n+---+---+---+---+---+---+---+---+";
const string twoRows = dottedLine + "\n| | . | | . | | . | | . |"
std::ostringstream ss;
- if (move)
+ if (m)
ss << "\nMove: " << (sideToMove == BLACK ? ".." : "")
- << move_to_san(*const_cast<Position*>(this), move);
+ << move_to_san(*const_cast<Position*>(this), m);
ss << brd << "\nFen: " << fen() << "\nKey: " << std::hex << std::uppercase
<< std::setfill('0') << std::setw(16) << st->key << "\nCheckers: ";
// the captured pawn.
case ENPASSANT:
{
- Square capsq = file_of(to) | rank_of(from);
+ Square capsq = make_square(file_of(to), rank_of(from));
Bitboard b = (pieces() ^ from ^ capsq) | to;
return (attacks_bb< ROOK>(ci.ksq, b) & pieces(sideToMove, QUEEN, ROOK))
string f, token;
std::stringstream ss(fen());
- for (Rank rank = RANK_8; rank >= RANK_1; --rank) // Piece placement
+ for (Rank r = RANK_8; r >= RANK_1; --r) // Piece placement
{
- std::getline(ss, token, rank > RANK_1 ? '/' : ' ');
+ std::getline(ss, token, r > RANK_1 ? '/' : ' ');
f.insert(0, token + (f.empty() ? " " : "/"));
}