/*
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
- Copyright (C) 2008 Marco Costalba
+ Copyright (C) 2008-2010 Marco Costalba, Joona Kiiski, Tord Romstad
Stockfish is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-
-////
-//// Includes
-////
-
-#include <cstring>
+#include <string>
#include "piece.h"
+static const std::string PieceChars(" pnbrqk PNBRQK");
-////
-//// Functions
-////
/// Translating piece types to/from English piece letters
-static const char PieceChars[] = " pnbrqk";
-
char piece_type_to_char(PieceType pt, bool upcase) {
- return char(upcase? toupper(PieceChars[pt]) : PieceChars[pt]);
+
+ return PieceChars[pt + (upcase ? 7 : 0)];
}
PieceType piece_type_from_char(char c) {
- const char* ch = strchr(PieceChars, tolower(c));
- return ch? PieceType(ch - PieceChars) : NO_PIECE_TYPE;
+
+ size_t idx = PieceChars.find(c);
+
+ return idx != std::string::npos ? PieceType(idx % 7) : PIECE_TYPE_NONE;
}