mirror of
https://github.com/HChaZZY/Stockfish.git
synced 2025-12-20 17:16:33 +08:00
Small code formatting in position.cpp
No functional change. Signed-off-by: Marco Costalba <mcostalba@gmail.com>
This commit is contained in:
@@ -128,8 +128,10 @@ void Position::from_fen(const std::string& fen) {
|
|||||||
|
|
||||||
i++;
|
i++;
|
||||||
while(strchr("KQkqabcdefghABCDEFGH-", fen[i])) {
|
while(strchr("KQkqabcdefghABCDEFGH-", fen[i])) {
|
||||||
if(fen[i] == '-') {
|
if (fen[i] == '-')
|
||||||
i++; break;
|
{
|
||||||
|
i++;
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
else if(fen[i] == 'K') allow_oo(WHITE);
|
else if(fen[i] == 'K') allow_oo(WHITE);
|
||||||
else if(fen[i] == 'Q') allow_ooo(WHITE);
|
else if(fen[i] == 'Q') allow_ooo(WHITE);
|
||||||
@@ -317,25 +319,6 @@ void Position::copy(const Position &pos) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/// Position::update_checkers() updates checkers info, used in do_move()
|
|
||||||
template<PieceType Piece>
|
|
||||||
inline void Position::update_checkers(Bitboard* pCheckersBB, Square ksq, Square from,
|
|
||||||
Square to, Bitboard dcCandidates) {
|
|
||||||
|
|
||||||
if (Piece != KING && bit_is_set(piece_attacks<Piece>(ksq), to))
|
|
||||||
set_bit(pCheckersBB, to);
|
|
||||||
|
|
||||||
if (Piece != QUEEN && bit_is_set(dcCandidates, from))
|
|
||||||
{
|
|
||||||
if (Piece != ROOK)
|
|
||||||
(*pCheckersBB) |= (piece_attacks<ROOK>(ksq) & rooks_and_queens(side_to_move()));
|
|
||||||
|
|
||||||
if (Piece != BISHOP)
|
|
||||||
(*pCheckersBB) |= (piece_attacks<BISHOP>(ksq) & bishops_and_queens(side_to_move()));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/// Position:pinned_pieces() returns a bitboard of all pinned (against the
|
/// Position:pinned_pieces() returns a bitboard of all pinned (against the
|
||||||
/// king) pieces for the given color.
|
/// king) pieces for the given color.
|
||||||
Bitboard Position::pinned_pieces(Color c) const {
|
Bitboard Position::pinned_pieces(Color c) const {
|
||||||
@@ -729,6 +712,27 @@ void Position::restore(const UndoInfo& u) {
|
|||||||
// u.capture is restored in undo_move()
|
// u.capture is restored in undo_move()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/// Position::update_checkers() is a private method to udpate chekers info
|
||||||
|
|
||||||
|
template<PieceType Piece>
|
||||||
|
inline void Position::update_checkers(Bitboard* pCheckersBB, Square ksq, Square from,
|
||||||
|
Square to, Bitboard dcCandidates) {
|
||||||
|
|
||||||
|
if (Piece != KING && bit_is_set(piece_attacks<Piece>(ksq), to))
|
||||||
|
set_bit(pCheckersBB, to);
|
||||||
|
|
||||||
|
if (Piece != QUEEN && bit_is_set(dcCandidates, from))
|
||||||
|
{
|
||||||
|
if (Piece != ROOK)
|
||||||
|
(*pCheckersBB) |= (piece_attacks<ROOK>(ksq) & rooks_and_queens(side_to_move()));
|
||||||
|
|
||||||
|
if (Piece != BISHOP)
|
||||||
|
(*pCheckersBB) |= (piece_attacks<BISHOP>(ksq) & bishops_and_queens(side_to_move()));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/// Position::do_move() makes a move, and backs up all information necessary
|
/// Position::do_move() makes a move, and backs up all information necessary
|
||||||
/// to undo the move to an UndoInfo object. The move is assumed to be legal.
|
/// to undo the move to an UndoInfo object. The move is assumed to be legal.
|
||||||
/// Pseudo-legal moves should be filtered out before this function is called.
|
/// Pseudo-legal moves should be filtered out before this function is called.
|
||||||
@@ -851,33 +855,13 @@ void Position::do_move(Move m, UndoInfo& u, Bitboard dcCandidates) {
|
|||||||
Square ksq = king_square(them);
|
Square ksq = king_square(them);
|
||||||
switch (piece)
|
switch (piece)
|
||||||
{
|
{
|
||||||
case PAWN:
|
case PAWN: update_checkers<PAWN>(&checkersBB, ksq, from, to, dcCandidates); break;
|
||||||
update_checkers<PAWN>(&checkersBB, ksq, from, to, dcCandidates);
|
case KNIGHT: update_checkers<KNIGHT>(&checkersBB, ksq, from, to, dcCandidates); break;
|
||||||
break;
|
case BISHOP: update_checkers<BISHOP>(&checkersBB, ksq, from, to, dcCandidates); break;
|
||||||
|
case ROOK: update_checkers<ROOK>(&checkersBB, ksq, from, to, dcCandidates); break;
|
||||||
case KNIGHT:
|
case QUEEN: update_checkers<QUEEN>(&checkersBB, ksq, from, to, dcCandidates); break;
|
||||||
update_checkers<KNIGHT>(&checkersBB, ksq, from, to, dcCandidates);
|
case KING: update_checkers<KING>(&checkersBB, ksq, from, to, dcCandidates); break;
|
||||||
break;
|
default: assert(false); break;
|
||||||
|
|
||||||
case BISHOP:
|
|
||||||
update_checkers<BISHOP>(&checkersBB, ksq, from, to, dcCandidates);
|
|
||||||
break;
|
|
||||||
|
|
||||||
case ROOK:
|
|
||||||
update_checkers<ROOK>(&checkersBB, ksq, from, to, dcCandidates);
|
|
||||||
break;
|
|
||||||
|
|
||||||
case QUEEN:
|
|
||||||
update_checkers<QUEEN>(&checkersBB, ksq, from, to, dcCandidates);
|
|
||||||
break;
|
|
||||||
|
|
||||||
case KING:
|
|
||||||
update_checkers<KING>(&checkersBB, ksq, from, to, dcCandidates);
|
|
||||||
break;
|
|
||||||
|
|
||||||
default:
|
|
||||||
assert(false);
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -892,6 +876,7 @@ void Position::do_move(Move m, UndoInfo& u, Bitboard dcCandidates) {
|
|||||||
assert(is_ok());
|
assert(is_ok());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/// Position::do_capture_move() is a private method used to update captured
|
/// Position::do_capture_move() is a private method used to update captured
|
||||||
/// piece info. It is called from the main Position::do_move function.
|
/// piece info. It is called from the main Position::do_move function.
|
||||||
|
|
||||||
@@ -1564,7 +1549,7 @@ void Position::undo_null_move(const UndoInfo &u) {
|
|||||||
/// material gain or loss resulting from a move. There are three versions of
|
/// material gain or loss resulting from a move. There are three versions of
|
||||||
/// this function: One which takes a destination square as input, one takes a
|
/// this function: One which takes a destination square as input, one takes a
|
||||||
/// move, and one which takes a 'from' and a 'to' square. The function does
|
/// move, and one which takes a 'from' and a 'to' square. The function does
|
||||||
/// not yet understand promotions or en passant captures.
|
/// not yet understand promotions captures.
|
||||||
|
|
||||||
int Position::see(Square to) const {
|
int Position::see(Square to) const {
|
||||||
|
|
||||||
@@ -1607,7 +1592,7 @@ int Position::see(Square from, Square to) const {
|
|||||||
occ = occupied_squares();
|
occ = occupied_squares();
|
||||||
|
|
||||||
// Handle en passant moves
|
// Handle en passant moves
|
||||||
if (ep_square() == to && type_of_piece_on(from) == PAWN)
|
if (epSquare == to && type_of_piece_on(from) == PAWN)
|
||||||
{
|
{
|
||||||
assert(capture == EMPTY);
|
assert(capture == EMPTY);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user