From 428962a2e8c754311119fa4f66c7c248d63cb2c8 Mon Sep 17 00:00:00 2001 From: Marco Costalba Date: Sun, 26 Oct 2014 06:52:30 +0100 Subject: [PATCH] Retire to_char() helpers Remove some useless wrappers and make the conversion explicit and starightforward. No functional change. --- src/notation.h | 10 +--------- src/position.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/src/notation.h b/src/notation.h index 251a0caf..12f4cfaa 100644 --- 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 cbaa07e8..ba399b12 100644 --- 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 << '-'; -- 2.39.2