Prefer an assert to a comment in position.h

[stockfish] / src / position.h

diff --git a/src/position.h b/src/position.h
index b811e8c62597b1ee7a3d2152fc54d249c3661fea..3ea5f6dfbe9fbd82f6965c206d08361fed5d9e1a 100644 (file)
--- a/src/position.h
+++ b/src/position.h
@@ -20,6 +20,8 @@
 #if !defined(POSITION_H_INCLUDED)
 #define POSITION_H_INCLUDED
 
+#include <cassert>
+
 #include "bitboard.h"
 #include "move.h"
 #include "types.h"
@@ -168,7 +170,7 @@ public:
 
   // Checking pieces and under check information
   Bitboard checkers() const;
-  bool is_check() const;
+  bool in_check() const;
 
   // Piece lists
   Square piece_list(Color c, PieceType pt, int index) const;
@@ -186,8 +188,8 @@ public:
   bool pl_move_is_evasion(Move m, Bitboard pinned) const;
   bool move_is_legal(const Move m) const;
   bool move_is_legal(const Move m, Bitboard pinned) const;
-  bool move_is_check(Move m) const;
-  bool move_is_check(Move m, const CheckInfo& ci) const;
+  bool move_gives_check(Move m) const;
+  bool move_gives_check(Move m, const CheckInfo& ci) const;
   bool move_is_capture(Move m) const;
   bool move_is_capture_or_promotion(Move m) const;
   bool move_is_passed_pawn_push(Move m) const;
@@ -454,7 +456,7 @@ inline Bitboard Position::checkers() const {
   return st->checkersBB;
 }
 
-inline bool Position::is_check() const {
+inline bool Position::in_check() const {
   return st->checkersBB != EmptyBoardBB;
 }
 
@@ -525,13 +527,13 @@ inline bool Position::is_chess960() const {
 
 inline bool Position::move_is_capture(Move m) const {
 
-  // Move must not be MOVE_NONE !
+  assert (m != MOVE_NONE && m != MOVE_NULL);
   return (m & (3 << 15)) ? !move_is_castle(m) : !square_is_empty(move_to(m));
 }
 
 inline bool Position::move_is_capture_or_promotion(Move m) const {
 
-  // Move must not be MOVE_NONE !
+  assert (m != MOVE_NONE && m != MOVE_NULL);
   return (m & (0x1F << 12)) ? !move_is_castle(m) : !square_is_empty(move_to(m));
 }