Rename CASTLE to CASTLING

[stockfish] / src / position.h

diff --git a/src/position.h b/src/position.h
index cd297df737839e15967b37a280f7cc054c8a70c0..903b1b646e1a475dbdaebe7fdf86ac7a799bcd84 100644 (file)
--- a/src/position.h
+++ b/src/position.h
@@ -51,7 +51,7 @@ struct CheckInfo {
 struct StateInfo {
   Key pawnKey, materialKey;
   Value npMaterial[COLOR_NB];
 struct StateInfo {
   Key pawnKey, materialKey;
   Value npMaterial[COLOR_NB];

-  int castleRights, rule50, pliesFromNull;
+  int castlingFlags, rule50, pliesFromNull;

   Score psq;
   Square epSquare;
 
   Score psq;
   Square epSquare;
 


@@ -100,10 +100,10 @@ public:
   template<PieceType Pt> const Square* list(Color c) const;
 
   // Castling
   template<PieceType Pt> const Square* list(Color c) const;
 
   // Castling

-  int can_castle(CastleRight f) const;
+  int can_castle(CastlingFlag f) const;

   int can_castle(Color c) const;
   int can_castle(Color c) const;

-  bool castle_impeded(Color c, CastlingSide s) const;
-  Square castle_rook_square(Color c, CastlingSide s) const;
+  bool castling_impeded(Color c, CastlingSide s) const;
+  Square castling_rook_square(Color c, CastlingSide s) const;

 
   // Checking
   Bitboard checkers() const;
 
   // Checking
   Bitboard checkers() const;


@@ -170,10 +170,10 @@ public:
 private:
   // Initialization helpers (used while setting up a position)
   void clear();
 private:
   // Initialization helpers (used while setting up a position)
   void clear();

-  void set_castle_right(Color c, Square rfrom);
+  void set_castling_flag(Color c, Square rfrom);

 
   // Helper functions
 
   // Helper functions

-  void do_castle(Square kfrom, Square kto, Square rfrom, Square rto);
+  void do_castling(Square kfrom, Square kto, Square rfrom, Square rto);

   Bitboard hidden_checkers(Square ksq, Color c, Color toMove) const;
   void put_piece(Square s, Color c, PieceType pt);
   void remove_piece(Square s, Color c, PieceType pt);
   Bitboard hidden_checkers(Square ksq, Color c, Color toMove) const;
   void put_piece(Square s, Color c, PieceType pt);
   void remove_piece(Square s, Color c, PieceType pt);


@@ -197,9 +197,9 @@ private:
   int index[SQUARE_NB];
 
   // Other info
   int index[SQUARE_NB];
 
   // Other info

-  int castleRightsMask[SQUARE_NB];
-  Square castleRookSquare[COLOR_NB][CASTLING_SIDE_NB];
-  Bitboard castlePath[COLOR_NB][CASTLING_SIDE_NB];
+  int castlingFlagsMask[SQUARE_NB];
+  Square castlingRookSquare[COLOR_NB][CASTLING_SIDE_NB];
+  Bitboard castlingPath[COLOR_NB][CASTLING_SIDE_NB];

   StateInfo startState;
   int64_t nodes;
   int gamePly;
   StateInfo startState;
   int64_t nodes;
   int gamePly;


@@ -273,20 +273,20 @@ inline Square Position::king_square(Color c) const {
   return pieceList[c][KING][0];
 }
 
   return pieceList[c][KING][0];
 }
 

-inline int Position::can_castle(CastleRight f) const {
-  return st->castleRights & f;
+inline int Position::can_castle(CastlingFlag f) const {
+  return st->castlingFlags & f;

 }
 
 inline int Position::can_castle(Color c) const {
 }
 
 inline int Position::can_castle(Color c) const {

-  return st->castleRights & ((WHITE_OO | WHITE_OOO) << (2 * c));
+  return st->castlingFlags & ((WHITE_OO | WHITE_OOO) << (2 * c));

 }
 
 }
 

-inline bool Position::castle_impeded(Color c, CastlingSide s) const {
-  return byTypeBB[ALL_PIECES] & castlePath[c][s];
+inline bool Position::castling_impeded(Color c, CastlingSide s) const {
+  return byTypeBB[ALL_PIECES] & castlingPath[c][s];

 }
 
 }
 

-inline Square Position::castle_rook_square(Color c, CastlingSide s) const {
-  return castleRookSquare[c][s];
+inline Square Position::castling_rook_square(Color c, CastlingSide s) const {
+  return castlingRookSquare[c][s];

 }
 
 template<PieceType Pt>
 }
 
 template<PieceType Pt>


@@ -380,14 +380,14 @@ inline bool Position::is_chess960() const {
 inline bool Position::capture_or_promotion(Move m) const {
 
   assert(is_ok(m));
 inline bool Position::capture_or_promotion(Move m) const {
 
   assert(is_ok(m));

-  return type_of(m) ? type_of(m) != CASTLE : !empty(to_sq(m));
+  return type_of(m) ? type_of(m) != CASTLING : !empty(to_sq(m));

 }
 
 inline bool Position::capture(Move m) const {
 
 }
 
 inline bool Position::capture(Move m) const {
 

-  // Note that castle is coded as "king captures the rook"
+  // Note that castling is encoded as "king captures the rook"

   assert(is_ok(m));
   assert(is_ok(m));

-  return (!empty(to_sq(m)) && type_of(m) != CASTLE) || type_of(m) == ENPASSANT;
+  return (!empty(to_sq(m)) && type_of(m) != CASTLING) || type_of(m) == ENPASSANT;

 }
 
 inline PieceType Position::captured_piece_type() const {
 }
 
 inline PieceType Position::captured_piece_type() const {