From e6376d9b8daae0aa0dcda618ec6330bda2dcfaf7 Mon Sep 17 00:00:00 2001 From: Marco Costalba Date: Sat, 7 Aug 2010 18:40:04 +0100 Subject: [PATCH] Rename constants to use *_NONE scheme To be uniform across the sources. As a nice side effect I quickly spotted a couple of needed renames: captured_piece() -> captured_piece_type() st->capture -> st->capturedType Proposed by Ralph and done with QtCreator No functional change. Signed-off-by: Marco Costalba --- src/material.cpp | 4 ++-- src/piece.cpp | 2 +- src/piece.h | 6 +++--- src/position.cpp | 44 ++++++++++++++++++++++---------------------- src/position.h | 22 +++++++++++----------- src/san.cpp | 2 +- src/search.cpp | 2 +- 7 files changed, 41 insertions(+), 41 deletions(-) diff --git a/src/material.cpp b/src/material.cpp index 03db87c8..0d38c37d 100644 --- a/src/material.cpp +++ b/src/material.cpp @@ -336,7 +336,7 @@ MaterialInfo* MaterialInfoTable::get_material_info(const Position& pos) { // // We use NO_PIECE_TYPE as a place holder for the bishop pair "extended piece", // this allow us to be more flexible in defining bishop pair bonuses. - for (pt1 = NO_PIECE_TYPE; pt1 <= QUEEN; pt1++) + for (pt1 = PIECE_TYPE_NONE; pt1 <= QUEEN; pt1++) { pc = pieceCount[c][pt1]; if (!pc) @@ -344,7 +344,7 @@ MaterialInfo* MaterialInfoTable::get_material_info(const Position& pos) { vv = LinearCoefficients[pt1]; - for (pt2 = NO_PIECE_TYPE; pt2 <= pt1; pt2++) + for (pt2 = PIECE_TYPE_NONE; pt2 <= pt1; pt2++) vv += pieceCount[c][pt2] * QuadraticCoefficientsSameColor[pt1][pt2] + pieceCount[them][pt2] * QuadraticCoefficientsOppositeColor[pt1][pt2]; diff --git a/src/piece.cpp b/src/piece.cpp index b2879949..4f2fde76 100644 --- a/src/piece.cpp +++ b/src/piece.cpp @@ -45,5 +45,5 @@ PieceType piece_type_from_char(char c) { size_t idx = PieceChars.find(c); - return idx != string::npos ? PieceType(idx % 7) : NO_PIECE_TYPE; + return idx != string::npos ? PieceType(idx % 7) : PIECE_TYPE_NONE; } diff --git a/src/piece.h b/src/piece.h index 2bac6ff9..7f5ea7a4 100644 --- a/src/piece.h +++ b/src/piece.h @@ -34,13 +34,13 @@ //// enum PieceType { - NO_PIECE_TYPE = 0, + PIECE_TYPE_NONE = 0, PAWN = 1, KNIGHT = 2, BISHOP = 3, ROOK = 4, QUEEN = 5, KING = 6 }; enum Piece { - NO_PIECE_DARK_SQ = 0, WP = 1, WN = 2, WB = 3, WR = 4, WQ = 5, WK = 6, - BP = 9, BN = 10, BB = 11, BR = 12, BQ = 13, BK = 14, NO_PIECE = 16 + PIECE_NONE_DARK_SQ = 0, WP = 1, WN = 2, WB = 3, WR = 4, WQ = 5, WK = 6, + BP = 9, BN = 10, BB = 11, BR = 12, BQ = 13, BK = 14, PIECE_NONE = 16 }; diff --git a/src/position.cpp b/src/position.cpp index 391e5568..35e26276 100644 --- a/src/position.cpp +++ b/src/position.cpp @@ -56,7 +56,7 @@ struct PieceLetters : std::map { operator[]('B') = WB; operator[]('b') = BB; operator[]('N') = WN; operator[]('n') = BN; operator[]('P') = WP; operator[]('p') = BP; - operator[](' ') = NO_PIECE; operator[]('.') = NO_PIECE_DARK_SQ; + operator[](' ') = PIECE_NONE; operator[]('.') = PIECE_NONE_DARK_SQ; } char from_piece(Piece p) const { @@ -344,7 +344,7 @@ const string Position::to_fen() const { fen.erase(--fen.end()); fen += (sideToMove == WHITE ? " w " : " b "); - if (st->castleRights != NO_CASTLES) + if (st->castleRights != CASTLES_NONE) { const bool Chess960 = initialKFile != FILE_E || initialQRFile != FILE_A @@ -400,8 +400,8 @@ void Position::print(Move move) const { char c = (color_of_piece_on(sq) == BLACK ? '=' : ' '); Piece piece = piece_on(sq); - if (piece == NO_PIECE && square_color(sq) == DARK) - piece = NO_PIECE_DARK_SQ; + if (piece == PIECE_NONE && square_color(sq) == DARK) + piece = PIECE_NONE_DARK_SQ; cout << c << pieceLetters.from_piece(piece) << c << '|'; } @@ -577,7 +577,7 @@ bool Position::pl_move_is_legal(Move m, Bitboard pinned) const { assert(to == ep_square()); assert(piece_on(from) == piece_of_color_and_type(us, PAWN)); assert(piece_on(capsq) == piece_of_color_and_type(them, PAWN)); - assert(piece_on(to) == NO_PIECE); + assert(piece_on(to) == PIECE_NONE); clear_bit(&b, from); clear_bit(&b, capsq); @@ -825,7 +825,7 @@ void Position::do_move(Move m, StateInfo& newSt, const CheckInfo& ci, bool moveI do_move_bb(&(byTypeBB[0]), move_bb); // HACK: byTypeBB[0] == occupied squares board[to] = board[from]; - board[from] = NO_PIECE; + board[from] = PIECE_NONE; // Update piece lists, note that index[from] is not updated and // becomes stale. This works as long as index[] is accessed just @@ -897,7 +897,7 @@ void Position::do_move(Move m, StateInfo& newSt, const CheckInfo& ci, bool moveI st->value += pst_delta(piece, from, to); // Set capture piece - st->capture = capture; + st->capturedType = capture; // Update the key with the final value st->key = key; @@ -954,10 +954,10 @@ void Position::do_capture_move(Key& key, PieceType capture, Color them, Square t assert(to == st->epSquare); assert(relative_rank(opposite_color(them), to) == RANK_6); - assert(piece_on(to) == NO_PIECE); + assert(piece_on(to) == PIECE_NONE); assert(piece_on(capsq) == piece_of_color_and_type(them, PAWN)); - board[capsq] = NO_PIECE; + board[capsq] = PIECE_NONE; } st->pawnKey ^= zobrist[them][PAWN][capsq]; } @@ -1012,7 +1012,7 @@ void Position::do_castle_move(Move m) { Color them = opposite_color(us); // Reset capture field - st->capture = NO_PIECE_TYPE; + st->capturedType = PIECE_TYPE_NONE; // Find source squares for king and rook Square kfrom = move_from(m); @@ -1051,7 +1051,7 @@ void Position::do_castle_move(Move m) { // Update board array Piece king = piece_of_color_and_type(us, KING); Piece rook = piece_of_color_and_type(us, ROOK); - board[kfrom] = board[rfrom] = NO_PIECE; + board[kfrom] = board[rfrom] = PIECE_NONE; board[kto] = king; board[rto] = rook; @@ -1160,35 +1160,35 @@ void Position::undo_move(Move m) { do_move_bb(&(byTypeBB[0]), move_bb); // HACK: byTypeBB[0] == occupied squares board[from] = piece_of_color_and_type(us, pt); - board[to] = NO_PIECE; + board[to] = PIECE_NONE; // Update piece list index[from] = index[to]; pieceList[us][pt][index[from]] = from; - if (st->capture) + if (st->capturedType) { Square capsq = to; if (ep) capsq = (us == WHITE)? (to - DELTA_N) : (to - DELTA_S); - assert(st->capture != KING); + assert(st->capturedType != KING); assert(!ep || square_is_empty(capsq)); // Restore the captured piece set_bit(&(byColorBB[them]), capsq); - set_bit(&(byTypeBB[st->capture]), capsq); + set_bit(&(byTypeBB[st->capturedType]), capsq); set_bit(&(byTypeBB[0]), capsq); - board[capsq] = piece_of_color_and_type(them, st->capture); + board[capsq] = piece_of_color_and_type(them, st->capturedType); // Update piece count - pieceCount[them][st->capture]++; + pieceCount[them][st->capturedType]++; // Update piece list, add a new captured piece in capsq square - index[capsq] = pieceCount[them][st->capture] - 1; - pieceList[them][st->capture][index[capsq]] = capsq; + index[capsq] = pieceCount[them][st->capturedType] - 1; + pieceList[them][st->capturedType][index[capsq]] = capsq; } // Finally point our state pointer back to the previous state @@ -1248,7 +1248,7 @@ void Position::undo_castle_move(Move m) { set_bit(&(byTypeBB[0]), rfrom); // HACK: byTypeBB[0] == occupied squares // Update board - board[rto] = board[kto] = NO_PIECE; + board[rto] = board[kto] = PIECE_NONE; board[rfrom] = piece_of_color_and_type(us, ROOK); board[kfrom] = piece_of_color_and_type(us, KING); @@ -1392,7 +1392,7 @@ int Position::see(Square from, Square to) const { // Handle en passant moves if (st->epSquare == to && type_of_piece_on(from) == PAWN) { - assert(capture == NO_PIECE); + assert(capture == PIECE_NONE); Square capQq = (side_to_move() == WHITE)? (to - DELTA_N) : (to - DELTA_S); capture = piece_on(capQq); @@ -1513,7 +1513,7 @@ void Position::clear() { memset(index, 0, sizeof(int) * 64); for (int i = 0; i < 64; i++) - board[i] = NO_PIECE; + board[i] = PIECE_NONE; for (int i = 0; i < 8; i++) for (int j = 0; j < 16; j++) diff --git a/src/position.h b/src/position.h index 9976eacb..e921b350 100644 --- a/src/position.h +++ b/src/position.h @@ -78,12 +78,12 @@ struct CheckInfo { /// Castle rights, encoded as bit fields enum CastleRights { - NO_CASTLES = 0, - WHITE_OO = 1, - BLACK_OO = 2, - WHITE_OOO = 4, - BLACK_OOO = 8, - ALL_CASTLES = 15 + CASTLES_NONE = 0, + WHITE_OO = 1, + BLACK_OO = 2, + WHITE_OOO = 4, + BLACK_OOO = 8, + ALL_CASTLES = 15 }; /// Game phase @@ -105,7 +105,7 @@ struct StateInfo { Score value; Value npMaterial[2]; - PieceType capture; + PieceType capturedType; Key key; Bitboard checkersBB; StateInfo* previous; @@ -227,7 +227,7 @@ public: bool move_attacks_square(Move m, Square s) const; // Piece captured with previous moves - PieceType captured_piece() const; + PieceType captured_piece_type() const; // Information about pawns bool pawn_is_passed(Color c, Square s) const; @@ -369,7 +369,7 @@ inline PieceType Position::type_of_piece_on(Square s) const { } inline bool Position::square_is_empty(Square s) const { - return piece_on(s) == NO_PIECE; + return piece_on(s) == PIECE_NONE; } inline bool Position::square_is_occupied(Square s) const { @@ -570,8 +570,8 @@ inline bool Position::move_is_capture_or_promotion(Move m) const { return (m & (0x1F << 12)) ? !move_is_castle(m) : !square_is_empty(move_to(m)); } -inline PieceType Position::captured_piece() const { - return st->capture; +inline PieceType Position::captured_piece_type() const { + return st->capturedType; } inline int Position::thread() const { diff --git a/src/san.cpp b/src/san.cpp index 545fae8f..190121a1 100644 --- a/src/san.cpp +++ b/src/san.cpp @@ -164,7 +164,7 @@ Move move_from_san(const Position& pos, const string& movestr) { // Normal moves. We use a simple FSM to parse the san string. enum { START, TO_FILE, TO_RANK, PROMOTION_OR_CHECK, PROMOTION, CHECK, END }; static const string pieceLetters = "KQRBN"; - PieceType pt = NO_PIECE_TYPE, promotion = NO_PIECE_TYPE; + PieceType pt = PIECE_TYPE_NONE, promotion = PIECE_TYPE_NONE; File fromFile = FILE_NONE, toFile = FILE_NONE; Rank fromRank = RANK_NONE, toRank = RANK_NONE; Square to; diff --git a/src/search.cpp b/src/search.cpp index fff00026..97ed340d 100644 --- a/src/search.cpp +++ b/src/search.cpp @@ -2035,7 +2035,7 @@ namespace { if ( m != MOVE_NULL && before != VALUE_NONE && after != VALUE_NONE - && pos.captured_piece() == NO_PIECE_TYPE + && pos.captured_piece_type() == PIECE_TYPE_NONE && !move_is_special(m)) H.set_gain(pos.piece_on(move_to(m)), move_to(m), -(before + after)); } -- 2.39.2