Retire to_char() helpers

Remove some useless wrappers and make
the conversion explicit and starightforward.

No functional change.

diff --git a/src/notation.h b/src/notation.h
index 251a0caf8ac109df5ff03c1349443e38cfae7d9e..12f4cfaa399fe52d46cb78eb4db4c8df54d135f7 100644 (file)
--- a/src/notation.h
+++ b/src/notation.h
@@ -30,16 +30,8 @@ std::string score_to_uci(Value v, Value alpha = -VALUE_INFINITE, Value beta = VA
 Move move_from_uci(const Position& pos, std::string& str);
 const std::string move_to_uci(Move m, bool chess960);
 
-inline char to_char(File f, bool tolower = true) {
-  return char(f - FILE_A + (tolower ? 'a' : 'A'));
-}
-
-inline char to_char(Rank r) {
-  return char(r - RANK_1 + '1');
-}
-
 inline const std::string to_string(Square s) {
-  char ch[] = { to_char(file_of(s)), to_char(rank_of(s)), 0 };
+  char ch[] = { 'a' + file_of(s), '1' + rank_of(s), 0 };
   return ch;
 }
 

diff --git a/src/position.cpp b/src/position.cpp
index cbaa07e86e6c7925aa810347fc63688f63810252..ba399b128c45ea7ab30c4440d71682fe1817ba25 100644 (file)
--- a/src/position.cpp
+++ b/src/position.cpp
@@ -409,16 +409,16 @@ const string Position::fen() const {
   ss << (sideToMove == WHITE ? " w " : " b ");
 
   if (can_castle(WHITE_OO))
-      ss << (chess960 ? to_char(file_of(castling_rook_square(WHITE |  KING_SIDE)), false) : 'K');
+      ss << (chess960 ? 'A' + file_of(castling_rook_square(WHITE |  KING_SIDE)) : 'K');
 
   if (can_castle(WHITE_OOO))
-      ss << (chess960 ? to_char(file_of(castling_rook_square(WHITE | QUEEN_SIDE)), false) : 'Q');
+      ss << (chess960 ? 'A' + file_of(castling_rook_square(WHITE | QUEEN_SIDE)) : 'Q');
 
   if (can_castle(BLACK_OO))
-      ss << (chess960 ? to_char(file_of(castling_rook_square(BLACK |  KING_SIDE)),  true) : 'k');
+      ss << (chess960 ? 'a' + file_of(castling_rook_square(BLACK |  KING_SIDE)) : 'k');
 
   if (can_castle(BLACK_OOO))
-      ss << (chess960 ? to_char(file_of(castling_rook_square(BLACK | QUEEN_SIDE)),  true) : 'q');
+      ss << (chess960 ? 'a' + file_of(castling_rook_square(BLACK | QUEEN_SIDE)) : 'q');
 
   if (!can_castle(WHITE) && !can_castle(BLACK))
       ss << '-';