QUEEN_SIDE
};
- const bool CAPTURE = true;
- const bool NON_CAPTURE = false;
+ enum MoveType {
+ CAPTURE,
+ NON_CAPTURE
+ };
// Functions
bool castling_is_check(const Position&, CastlingSide);
}
- // Template generate_piece_moves() with specializations
+ // Template generate_piece_moves() with specializations and overloads
template<PieceType>
MoveStack* generate_piece_moves(const Position&, MoveStack*, Color us, Bitboard);
template<>
- MoveStack* generate_piece_moves<KING>(const Position& pos, MoveStack* mlist, Color us, Bitboard target);
+ MoveStack* generate_piece_moves<KING>(const Position&, MoveStack*, Color, Bitboard);
- template<PieceType Piece, bool Capture>
+ template<PieceType Piece, MoveType Type>
inline MoveStack* generate_piece_moves(const Position& p, MoveStack* m, Color us) {
assert(Piece == PAWN);
- if (Capture)
+ if (Type == CAPTURE)
return (us == WHITE ? generate_pawn_captures<WHITE, BLACK, Rank8BB, DELTA_NE, DELTA_NW, DELTA_N>(p, m)
: generate_pawn_captures<BLACK, WHITE, Rank1BB, DELTA_SE, DELTA_SW, DELTA_S>(p, m));
else
: generate_pawn_noncaptures<BLACK, WHITE, Rank1BB, Rank6BB, DELTA_SE, DELTA_SW, DELTA_S>(p, m));
}
- // Template generate_piece_blocking_evasions() with specializations
template<PieceType>
- MoveStack* generate_piece_blocking_evasions(const Position&, MoveStack*, Color us, Bitboard, Bitboard);
+ MoveStack* generate_piece_moves(const Position&, MoveStack*, Color us, Bitboard, Bitboard);
template<>
- inline MoveStack* generate_piece_blocking_evasions<PAWN>(const Position& p, MoveStack* m, Color us,
- Bitboard pnd, Bitboard bs) {
+ inline MoveStack* generate_piece_moves<PAWN>(const Position& p, MoveStack* m,
+ Color us, Bitboard t, Bitboard pnd) {
if (us == WHITE)
- return generate_pawn_blocking_evasions<WHITE, RANK_8, Rank3BB, DELTA_N>(p, pnd, bs, m);
+ return generate_pawn_blocking_evasions<WHITE, RANK_8, Rank3BB, DELTA_N>(p, pnd, t, m);
else
- return generate_pawn_blocking_evasions<BLACK, RANK_1, Rank6BB, DELTA_S>(p, pnd, bs, m);
+ return generate_pawn_blocking_evasions<BLACK, RANK_1, Rank6BB, DELTA_S>(p, pnd, t, m);
}
}
Square ksq = pos.king_square(opposite_color(us));
MoveStack* mlist_start = mlist;
- assert(pos.piece_on(ksq) == king_of_color(opposite_color(us)));
+ assert(pos.piece_on(ksq) == piece_of_color_and_type(opposite_color(us), KING));
// Pieces moves
mlist = generate_piece_checks<PAWN>(pos, mlist, us, dc, ksq);
Square ksq = pos.king_square(us);
MoveStack* mlist_start = mlist;
- assert(pos.piece_on(ksq) == king_of_color(us));
+ assert(pos.piece_on(ksq) == piece_of_color_and_type(us, KING));
// The bitboard of occupied pieces without our king
Bitboard b_noKing = pos.occupied_squares();
if (blockSquares != EmptyBoardBB)
{
- // Pieces moves
- mlist = generate_piece_blocking_evasions<PAWN>(pos, mlist, us, pinned, blockSquares);
- mlist = generate_piece_blocking_evasions<KNIGHT>(pos, mlist, us, pinned, blockSquares);
- mlist = generate_piece_blocking_evasions<BISHOP>(pos, mlist, us, pinned, blockSquares);
- mlist = generate_piece_blocking_evasions<ROOK>(pos, mlist, us, pinned, blockSquares);
- mlist = generate_piece_blocking_evasions<QUEEN>(pos, mlist, us, pinned, blockSquares);
+ mlist = generate_piece_moves<PAWN>(pos, mlist, us, blockSquares, pinned);
+ mlist = generate_piece_moves<KNIGHT>(pos, mlist, us, blockSquares, pinned);
+ mlist = generate_piece_moves<BISHOP>(pos, mlist, us, blockSquares, pinned);
+ mlist = generate_piece_moves<ROOK>(pos, mlist, us, blockSquares, pinned);
+ mlist = generate_piece_moves<QUEEN>(pos, mlist, us, blockSquares, pinned);
}
}
return false;
assert(pos.square_is_empty(to));
- assert(pos.piece_on(to - pawn_push(us)) == pawn_of_color(them));
+ assert(pos.piece_on(to - pawn_push(us)) == piece_of_color_and_type(them, PAWN));
// The move is pseudo-legal, check if it is also legal
return pos.pl_move_is_legal(m, pinned);
assert(from == pos.king_square(us));
assert(to == pos.initial_kr_square(us));
- assert(pos.piece_on(to) == rook_of_color(us));
+ assert(pos.piece_on(to) == piece_of_color_and_type(us, ROOK));
Square g1 = relative_square(us, SQ_G1);
Square f1 = relative_square(us, SQ_F1);
assert(from == pos.king_square(us));
assert(to == pos.initial_qr_square(us));
- assert(pos.piece_on(to) == rook_of_color(us));
+ assert(pos.piece_on(to) == piece_of_color_and_type(us, ROOK));
Square c1 = relative_square(us, SQ_C1);
Square d1 = relative_square(us, SQ_D1);
illegal = true;
if ( square_file(to) == FILE_B
- && ( pos.piece_on(to + DELTA_W) == rook_of_color(them)
- || pos.piece_on(to + DELTA_W) == queen_of_color(them)))
+ && ( pos.piece_on(to + DELTA_W) == piece_of_color_and_type(them, ROOK)
+ || pos.piece_on(to + DELTA_W) == piece_of_color_and_type(them, QUEEN)))
illegal = true;
return !illegal;
}
// Luckly we can handle all the other pieces in one go
- return ( pos.piece_attacks_square(from, to)
+ return ( pos.piece_attacks_square(pos.piece_on(from), from, to)
&& pos.pl_move_is_legal(m, pinned)
&& !move_promotion(m));
}
return mlist;
}
- template<>
- MoveStack* generate_piece_moves<KING>(const Position& pos, MoveStack* mlist, Color us, Bitboard target) {
-
- Bitboard b;
- Square from = pos.king_square(us);
-
- b = pos.piece_attacks<KING>(from) & target;
- SERIALIZE_MOVES(b);
- return mlist;
- }
-
template<PieceType Piece>
- MoveStack* generate_piece_blocking_evasions(const Position& pos, MoveStack* mlist, Color us,
- Bitboard pinned, Bitboard blockSquares) {
+ MoveStack* generate_piece_moves(const Position& pos, MoveStack* mlist,
+ Color us, Bitboard target, Bitboard pinned) {
Square from;
Bitboard b;
if (pinned && bit_is_set(pinned, from))
continue;
- b = pos.piece_attacks<Piece>(from) & blockSquares;
+ b = pos.piece_attacks<Piece>(from) & target;
SERIALIZE_MOVES(b);
}
return mlist;
}
+ template<>
+ MoveStack* generate_piece_moves<KING>(const Position& pos, MoveStack* mlist, Color us, Bitboard target) {
+
+ Bitboard b;
+ Square from = pos.king_square(us);
+
+ b = pos.piece_attacks<KING>(from) & target;
+ SERIALIZE_MOVES(b);
+ return mlist;
+ }
+
template<Color Us, Color Them, Bitboard TRank8BB, SquareDelta TDELTA_NE,
SquareDelta TDELTA_NW, SquareDelta TDELTA_N
>
Color them = opposite_color(us);
Square ksq = pos.king_square(us);
- assert(pos.piece_on(ksq) == king_of_color(us));
+ assert(pos.piece_on(ksq) == piece_of_color_and_type(us, KING));
Square rsq = (Side == KING_SIDE ? pos.initial_kr_square(us) : pos.initial_qr_square(us));
Square s1 = relative_square(us, Side == KING_SIDE ? SQ_G1 : SQ_C1);
Square s;
bool illegal = false;
- assert(pos.piece_on(rsq) == rook_of_color(us));
+ assert(pos.piece_on(rsq) == piece_of_color_and_type(us, ROOK));
// It is a bit complicated to correctly handle Chess960
for (s = Min(ksq, s1); s <= Max(ksq, s1); s++)
if ( Side == QUEEN_SIDE
&& square_file(rsq) == FILE_B
- && ( pos.piece_on(relative_square(us, SQ_A1)) == rook_of_color(them)
- || pos.piece_on(relative_square(us, SQ_A1)) == queen_of_color(them)))
+ && ( pos.piece_on(relative_square(us, SQ_A1)) == piece_of_color_and_type(them, ROOK)
+ || pos.piece_on(relative_square(us, SQ_A1)) == piece_of_color_and_type(them, QUEEN)))
illegal = true;
if (!illegal)