Unify some template specializations

[stockfish] / src / position.h

diff --git a/src/position.h b/src/position.h
index 8826fa201161cfd9182502d1148b2105a410f106..bcbfc850d0c8b15eb4677f63b447996fde6fdeca 100644 (file)
--- a/src/position.h
+++ b/src/position.h
@@ -210,7 +210,7 @@ private:
   // Initialization helper functions (used while setting up a position)
   void clear();
   void put_piece(Piece p, Square s);
-  void set_castle_right(Square ksq, Square rsq);
+  void set_castle_right(Color c, Square rsq);
   bool move_is_legal(const Move m) const;
 
   // Helper template functions
@@ -342,29 +342,17 @@ inline Square Position::castle_rook_square(CastleRight f) const {
   return castleRookSquare[f];
 }
 
-template<>
-inline Bitboard Position::attacks_from<PAWN>(Square s, Color c) const {
-  return StepAttacksBB[make_piece(c, PAWN)][s];
-}
-
-template<PieceType Piece> // Knight and King and white pawns
+template<PieceType Pt>
 inline Bitboard Position::attacks_from(Square s) const {
-  return StepAttacksBB[Piece][s];
+  return  Pt == BISHOP ? bishop_attacks_bb(s, occupied_squares())
+        : Pt == ROOK   ? rook_attacks_bb(s, occupied_squares())
+        : Pt == QUEEN  ? attacks_from<ROOK>(s) | attacks_from<BISHOP>(s)
+                       : StepAttacksBB[Pt][s];
 }
 
 template<>
-inline Bitboard Position::attacks_from<BISHOP>(Square s) const {
-  return bishop_attacks_bb(s, occupied_squares());
-}
-
-template<>
-inline Bitboard Position::attacks_from<ROOK>(Square s) const {
-  return rook_attacks_bb(s, occupied_squares());
-}
-
-template<>
-inline Bitboard Position::attacks_from<QUEEN>(Square s) const {
-  return attacks_from<ROOK>(s) | attacks_from<BISHOP>(s);
+inline Bitboard Position::attacks_from<PAWN>(Square s, Color c) const {
+  return StepAttacksBB[make_piece(c, PAWN)][s];
 }
 
 inline Bitboard Position::attacks_from(Piece p, Square s) const {
@@ -392,7 +380,7 @@ inline Bitboard Position::pinned_pieces() const {
 }
 
 inline bool Position::pawn_is_passed(Color c, Square s) const {
-  return !(pieces(PAWN, flip(c)) & passed_pawn_mask(c, s));
+  return !(pieces(PAWN, ~c) & passed_pawn_mask(c, s));
 }
 
 inline Key Position::key() const {