Retire some unused functions

No functional change.

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

diff --git a/src/position.cpp b/src/position.cpp
index 8f70b5dfd3ab3af4c644072396622c75257ce381..91fe7ab4506d9b11c85f626412dbf2be38ae77a0 100644 (file)
--- a/src/position.cpp
+++ b/src/position.cpp
@@ -208,7 +208,7 @@ void Position::from_fen(const string& fen, bool isChess960) {
   if (   ((ss >> col) && (col >= 'a' && col <= 'h'))
       && ((ss >> row) && (row == '3' || row == '6')))
   {
-      st->epSquare = make_square(file_from_char(col), rank_from_char(row));
+      st->epSquare = make_square(File(col - 'a') + FILE_A, Rank(row - '1') + RANK_1);
 
       // Ignore if no capture is possible
       Color them = opposite_color(sideToMove);
@@ -1913,7 +1913,7 @@ bool Position::is_ok(int* failedStep) const {
   if (failedStep) *failedStep = 1;
 
   // Side to move OK?
-  if (!color_is_ok(side_to_move()))
+  if (side_to_move() != WHITE && side_to_move() != BLACK)
       return false;
 
   // Are the king squares in the position correct?
@@ -1927,10 +1927,10 @@ bool Position::is_ok(int* failedStep) const {
 
   // Castle files OK?
   if (failedStep) (*failedStep)++;
-  if (!file_is_ok(initialKRFile))
+  if (!square_is_ok(make_square(initialKRFile, RANK_1)))
       return false;
 
-  if (!file_is_ok(initialQRFile))
+  if (!square_is_ok(make_square(initialQRFile, RANK_1)))
       return false;
 
   // Do both sides have exactly one king?

diff --git a/src/types.h b/src/types.h
index 8093a713f5148204359b51aa7dd242748e310b44..345751455dbf54d853a88dd874eea367ecd58e35 100644 (file)
--- a/src/types.h
+++ b/src/types.h
@@ -360,18 +360,6 @@ inline Color opposite_color(Color c) {
   return Color(c ^ 1);
 }
 
-inline bool color_is_ok(Color c) {
-  return c == WHITE || c == BLACK;
-}
-
-inline bool piece_type_is_ok(PieceType pt) {
-  return pt >= PAWN && pt <= KING;
-}
-
-inline bool piece_is_ok(Piece p) {
-  return piece_type_is_ok(type_of_piece(p)) && color_is_ok(color_of_piece(p));
-}
-
 inline char piece_type_to_char(PieceType pt) {
   static const char ch[] = " PNBRQK";
   return ch[pt];
@@ -381,6 +369,10 @@ inline Square make_square(File f, Rank r) {
   return Square((r << 3) | f);
 }
 
+inline bool square_is_ok(Square s) {
+  return s >= SQ_A1 && s <= SQ_H8;
+}
+
 inline File square_file(Square s) {
   return File(s & 7);
 }
@@ -430,18 +422,10 @@ inline int square_distance(Square s1, Square s2) {
   return Max(file_distance(s1, s2), rank_distance(s1, s2));
 }
 
-inline File file_from_char(char c) {
-  return File(c - 'a') + FILE_A;
-}
-
 inline char file_to_char(File f) {
   return char(f - FILE_A + int('a'));
 }
 
-inline Rank rank_from_char(char c) {
-  return Rank(c - '1') + RANK_1;
-}
-
 inline char rank_to_char(Rank r) {
   return char(r - RANK_1 + int('1'));
 }
@@ -451,18 +435,6 @@ inline const std::string square_to_string(Square s) {
   return std::string(ch);
 }
 
-inline bool file_is_ok(File f) {
-  return f >= FILE_A && f <= FILE_H;
-}
-
-inline bool rank_is_ok(Rank r) {
-  return r >= RANK_1 && r <= RANK_8;
-}
-
-inline bool square_is_ok(Square s) {
-  return s >= SQ_A1 && s <= SQ_H8;
-}
-
 inline Square pawn_push(Color c) {
   return c == WHITE ? DELTA_N : DELTA_S;
 }