Small cleanups

[stockfish] / src / position.h

diff --git a/src/position.h b/src/position.h
index 6791455fd00bc1f83f7fc42752ac0f044179bfed..34a6abc3b5ede3baefe849de93549afc31a852d0 100644 (file)
--- a/src/position.h
+++ b/src/position.h
@@ -83,7 +83,6 @@ public:
   const std::string fen() const;
 
   // Position representation
   const std::string fen() const;
 
   // Position representation

-  Bitboard pieces() const;

   Bitboard pieces(PieceType pt) const;
   Bitboard pieces(PieceType pt1, PieceType pt2) const;
   Bitboard pieces(Color c) const;
   Bitboard pieces(PieceType pt) const;
   Bitboard pieces(PieceType pt1, PieceType pt2) const;
   Bitboard pieces(Color c) const;


@@ -174,8 +173,8 @@ private:
 
   // Other helpers
   void put_piece(Piece pc, Square s);
 
   // Other helpers
   void put_piece(Piece pc, Square s);

-  void remove_piece(Piece pc, Square s);
-  void move_piece(Piece pc, Square from, Square to);
+  void remove_piece(Square s);
+  void move_piece(Square from, Square to);

   template<bool Do>
   void do_castling(Color us, Square from, Square& to, Square& rfrom, Square& rto);
 
   template<bool Do>
   void do_castling(Color us, Square from, Square& to, Square& rfrom, Square& rto);
 


@@ -207,28 +206,25 @@ inline Color Position::side_to_move() const {
   return sideToMove;
 }
 
   return sideToMove;
 }
 

-inline bool Position::empty(Square s) const {
-  return board[s] == NO_PIECE;
-}
-

 inline Piece Position::piece_on(Square s) const {
 inline Piece Position::piece_on(Square s) const {

+  assert(is_ok(s));

   return board[s];
 }
 
   return board[s];
 }
 

-inline Piece Position::moved_piece(Move m) const {
-  return board[from_sq(m)];
+inline bool Position::empty(Square s) const {
+  return piece_on(s) == NO_PIECE;

 }
 
 }
 

-inline Bitboard Position::pieces() const {
-  return byTypeBB[ALL_PIECES];
+inline Piece Position::moved_piece(Move m) const {
+  return piece_on(from_sq(m));

 }
 
 }
 

-inline Bitboard Position::pieces(PieceType pt) const {
+inline Bitboard Position::pieces(PieceType pt = ALL_PIECES) const {

   return byTypeBB[pt];
 }
 
 inline Bitboard Position::pieces(PieceType pt1, PieceType pt2) const {
   return byTypeBB[pt];
 }
 
 inline Bitboard Position::pieces(PieceType pt1, PieceType pt2) const {

-  return byTypeBB[pt1] | byTypeBB[pt2];
+  return pieces(pt1) | pieces(pt2);

 }
 
 inline Bitboard Position::pieces(Color c) const {
 }
 
 inline Bitboard Position::pieces(Color c) const {


@@ -236,11 +232,11 @@ inline Bitboard Position::pieces(Color c) const {
 }
 
 inline Bitboard Position::pieces(Color c, PieceType pt) const {
 }
 
 inline Bitboard Position::pieces(Color c, PieceType pt) const {

-  return byColorBB[c] & byTypeBB[pt];
+  return pieces(c) & pieces(pt);

 }
 
 inline Bitboard Position::pieces(Color c, PieceType pt1, PieceType pt2) const {
 }
 
 inline Bitboard Position::pieces(Color c, PieceType pt1, PieceType pt2) const {

-  return byColorBB[c] & (byTypeBB[pt1] | byTypeBB[pt2]);
+  return pieces(c) & (pieces(pt1) | pieces(pt2));

 }
 
 template<PieceType Pt> inline int Position::count(Color c) const {
 }
 
 template<PieceType Pt> inline int Position::count(Color c) const {


@@ -248,7 +244,7 @@ template<PieceType Pt> inline int Position::count(Color c) const {
 }
 
 template<PieceType Pt> inline int Position::count() const {
 }
 
 template<PieceType Pt> inline int Position::count() const {

-  return pieceCount[make_piece(WHITE, Pt)] + pieceCount[make_piece(BLACK, Pt)];
+  return count<Pt>(WHITE) + count<Pt>(BLACK);

 }
 
 template<PieceType Pt> inline const Square* Position::squares(Color c) const {
 }
 
 template<PieceType Pt> inline const Square* Position::squares(Color c) const {


@@ -257,7 +253,7 @@ template<PieceType Pt> inline const Square* Position::squares(Color c) const {
 
 template<PieceType Pt> inline Square Position::square(Color c) const {
   assert(pieceCount[make_piece(c, Pt)] == 1);
 
 template<PieceType Pt> inline Square Position::square(Color c) const {
   assert(pieceCount[make_piece(c, Pt)] == 1);

-  return pieceList[make_piece(c, Pt)][0];
+  return squares<Pt>(c)[0];

 }
 
 inline Square Position::ep_square() const {
 }
 
 inline Square Position::ep_square() const {


@@ -273,13 +269,13 @@ inline bool Position::can_castle(CastlingRights cr) const {
 }
 
 inline int Position::castling_rights(Color c) const {
 }
 
 inline int Position::castling_rights(Color c) const {

-  return st->castlingRights & (c == WHITE ? WHITE_CASTLING : BLACK_CASTLING);
+  return c & CastlingRights(st->castlingRights);

 }
 
 inline bool Position::castling_impeded(CastlingRights cr) const {
   assert(cr == WHITE_OO || cr == WHITE_OOO || cr == BLACK_OO || cr == BLACK_OOO);
 
 }
 
 inline bool Position::castling_impeded(CastlingRights cr) const {
   assert(cr == WHITE_OO || cr == WHITE_OOO || cr == BLACK_OO || cr == BLACK_OOO);
 

-  return byTypeBB[ALL_PIECES] & castlingPath[cr];
+  return pieces() & castlingPath[cr];

 }
 
 inline Square Position::castling_rook_square(CastlingRights cr) const {
 }
 
 inline Square Position::castling_rook_square(CastlingRights cr) const {


@@ -292,7 +288,7 @@ template<PieceType Pt>
 inline Bitboard Position::attacks_from(Square s) const {
   static_assert(Pt != PAWN, "Pawn attacks need color");
 
 inline Bitboard Position::attacks_from(Square s) const {
   static_assert(Pt != PAWN, "Pawn attacks need color");
 

-  return  Pt == BISHOP || Pt == ROOK ? attacks_bb<Pt>(s, byTypeBB[ALL_PIECES])
+  return  Pt == BISHOP || Pt == ROOK ? attacks_bb<Pt>(s, pieces())

         : Pt == QUEEN  ? attacks_from<ROOK>(s) | attacks_from<BISHOP>(s)
         : PseudoAttacks[Pt][s];
 }
         : Pt == QUEEN  ? attacks_from<ROOK>(s) | attacks_from<BISHOP>(s)
         : PseudoAttacks[Pt][s];
 }


@@ -303,11 +299,11 @@ inline Bitboard Position::attacks_from<PAWN>(Square s, Color c) const {
 }
 
 inline Bitboard Position::attacks_from(PieceType pt, Square s) const {
 }
 
 inline Bitboard Position::attacks_from(PieceType pt, Square s) const {

-  return attacks_bb(pt, s, byTypeBB[ALL_PIECES]);
+  return attacks_bb(pt, s, pieces());

 }
 
 inline Bitboard Position::attackers_to(Square s) const {
 }
 
 inline Bitboard Position::attackers_to(Square s) const {

-  return attackers_to(s, byTypeBB[ALL_PIECES]);
+  return attackers_to(s, pieces());

 }
 
 inline Bitboard Position::checkers() const {
 }
 
 inline Bitboard Position::checkers() const {


@@ -360,7 +356,7 @@ inline Value Position::non_pawn_material(Color c) const {
 }
 
 inline Value Position::non_pawn_material() const {
 }
 
 inline Value Position::non_pawn_material() const {

-  return st->nonPawnMaterial[WHITE] + st->nonPawnMaterial[BLACK];
+  return non_pawn_material(WHITE) + non_pawn_material(BLACK);

 }
 
 inline int Position::game_ply() const {
 }
 
 inline int Position::game_ply() const {


@@ -372,8 +368,8 @@ inline int Position::rule50_count() const {
 }
 
 inline bool Position::opposite_bishops() const {
 }
 
 inline bool Position::opposite_bishops() const {

-  return   pieceCount[W_BISHOP] == 1
-        && pieceCount[B_BISHOP] == 1
+  return   count<BISHOP>(WHITE) == 1
+        && count<BISHOP>(BLACK) == 1

         && opposite_colors(square<BISHOP>(WHITE), square<BISHOP>(BLACK));
 }
 
         && opposite_colors(square<BISHOP>(WHITE), square<BISHOP>(BLACK));
 }
 


@@ -412,12 +408,13 @@ inline void Position::put_piece(Piece pc, Square s) {
   psq += PSQT::psq[pc][s];
 }
 
   psq += PSQT::psq[pc][s];
 }
 

-inline void Position::remove_piece(Piece pc, Square s) {
+inline void Position::remove_piece(Square s) {

 
   // WARNING: This is not a reversible operation. If we remove a piece in
   // do_move() and then replace it in undo_move() we will put it at the end of
   // the list and not in its original place, it means index[] and pieceList[]
   // are not invariant to a do_move() + undo_move() sequence.
 
   // WARNING: This is not a reversible operation. If we remove a piece in
   // do_move() and then replace it in undo_move() we will put it at the end of
   // the list and not in its original place, it means index[] and pieceList[]
   // are not invariant to a do_move() + undo_move() sequence.

+  Piece pc = board[s];

   byTypeBB[ALL_PIECES] ^= s;
   byTypeBB[type_of(pc)] ^= s;
   byColorBB[color_of(pc)] ^= s;
   byTypeBB[ALL_PIECES] ^= s;
   byTypeBB[type_of(pc)] ^= s;
   byColorBB[color_of(pc)] ^= s;


@@ -430,10 +427,11 @@ inline void Position::remove_piece(Piece pc, Square s) {
   psq -= PSQT::psq[pc][s];
 }
 
   psq -= PSQT::psq[pc][s];
 }
 

-inline void Position::move_piece(Piece pc, Square from, Square to) {
+inline void Position::move_piece(Square from, Square to) {

 
   // index[from] is not updated and becomes stale. This works as long as index[]
   // is accessed just by known occupied squares.
 
   // index[from] is not updated and becomes stale. This works as long as index[]
   // is accessed just by known occupied squares.

+  Piece pc = board[from];

   Bitboard fromTo = from | to;
   byTypeBB[ALL_PIECES] ^= fromTo;
   byTypeBB[type_of(pc)] ^= fromTo;
   Bitboard fromTo = from | to;
   byTypeBB[ALL_PIECES] ^= fromTo;
   byTypeBB[type_of(pc)] ^= fromTo;