Retire redundant square_is_occupied()

No functional change.

Signed-off-by: Marco Costalba <mcostalba@gmail.com>

diff --git a/src/movegen.cpp b/src/movegen.cpp
index 3d736b255952537f26515f97b5118116b9b1fce9..cc635b84e37160a59cf004fff974d18124397869 100644 (file)
--- a/src/movegen.cpp
+++ b/src/movegen.cpp
@@ -517,12 +517,12 @@ namespace {
 
     // It is a bit complicated to correctly handle Chess960
     for (s = Min(ksq, s1); s <= Max(ksq, s1); s++)
-        if (  (s != ksq && s != rsq && pos.square_is_occupied(s))
+        if (  (s != ksq && s != rsq && !pos.square_is_empty(s))
             ||(pos.attackers_to(s) & pos.pieces_of_color(them)))
             illegal = true;
 
     for (s = Min(rsq, s2); s <= Max(rsq, s2); s++)
-        if (s != ksq && s != rsq && pos.square_is_occupied(s))
+        if (s != ksq && s != rsq && !pos.square_is_empty(s))
             illegal = true;
 
     if (   Side == QUEEN_SIDE

diff --git a/src/position.cpp b/src/position.cpp
index c9da8d8b56e25e5df22b9610e59fde0524b3f58a..77c0647a940b33165bd4217bfe1a090b5030a3d2 100644 (file)
--- a/src/position.cpp
+++ b/src/position.cpp
@@ -282,7 +282,7 @@ const string Position::to_fen() const {
       {
           sq = make_square(file, rank);
 
-          if (square_is_occupied(sq))
+          if (!square_is_empty(sq))
           {
               if (emptyCnt != '0')
               {
@@ -475,7 +475,7 @@ bool Position::move_attacks_square(Move m, Square s) const {
   Bitboard occ, xray;
   Square f = move_from(m), t = move_to(m);
 
-  assert(square_is_occupied(f));
+  assert(!square_is_empty(f));
 
   if (bit_is_set(attacks_from(piece_on(f), t), s))
       return true;
@@ -1606,7 +1606,7 @@ Key Position::compute_key() const {
   Key result = zobCastle[st->castleRights];
 
   for (Square s = SQ_A1; s <= SQ_H8; s++)
-      if (square_is_occupied(s))
+      if (!square_is_empty(s))
           result ^= zobrist[piece_color(piece_on(s))][piece_type(piece_on(s))][s];
 
   if (ep_square() != SQ_NONE)

diff --git a/src/position.h b/src/position.h
index b30b1ffe4be16870be978dac20900351c3eace1b..244d365ba47a67d400cd62fb854886f94de9fa82 100644 (file)
--- a/src/position.h
+++ b/src/position.h
@@ -130,7 +130,6 @@ public:
   // The piece on a given square
   Piece piece_on(Square s) const;
   bool square_is_empty(Square s) const;
-  bool square_is_occupied(Square s) const;
 
   // Side to move
   Color side_to_move() const;
@@ -322,10 +321,6 @@ inline bool Position::square_is_empty(Square s) const {
   return piece_on(s) == PIECE_NONE;
 }
 
-inline bool Position::square_is_occupied(Square s) const {
-  return !square_is_empty(s);
-}
-
 inline Color Position::side_to_move() const {
   return sideToMove;
 }