Retire piece_type_from_char()

[stockfish] / src / piece.h

diff --git a/src/piece.h b/src/piece.h
index 59fb83924d1f79dfc7fbffb8a95401ef77bae915..b71f849d8e7b1639532112edf3d967cae940e8cc 100644 (file)
--- a/src/piece.h
+++ b/src/piece.h
@@ -17,25 +17,12 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-
 #if !defined(PIECE_H_INCLUDED)
 #define PIECE_H_INCLUDED
 
-////
-//// Includes
-////
-
-#include <string>
-
 #include "color.h"
-#include "square.h"
 #include "value.h"
 
-
-////
-//// Types
-////
-
 enum PieceType {
   PIECE_TYPE_NONE = 0,
   PAWN = 1, KNIGHT = 2, BISHOP = 3, ROOK = 4, QUEEN = 5, KING = 6
@@ -46,13 +33,8 @@ enum Piece {
   BP = 9, BN = 10, BB = 11, BR = 12, BQ = 13, BK = 14, PIECE_NONE = 16
 };
 
-ENABLE_OPERATORS_ON(PieceType);
-ENABLE_OPERATORS_ON(Piece);
-
-
-////
-//// Constants
-////
+ENABLE_OPERATORS_ON(PieceType)
+ENABLE_OPERATORS_ON(Piece)
 
 /// Important: If the material values are changed, one must also
 /// adjust the piece square tables, and the method game_phase() in the
@@ -71,11 +53,6 @@ const Value RookValueEndgame   = Value(0x4FE);
 const Value QueenValueMidgame  = Value(0x9D9);
 const Value QueenValueEndgame  = Value(0x9FE);
 
-
-////
-//// Inline functions
-////
-
 inline PieceType type_of_piece(Piece p)  {
   return PieceType(int(p) & 7);
 }
@@ -88,24 +65,17 @@ inline Piece piece_of_color_and_type(Color c, PieceType pt) {
   return Piece((int(c) << 3) | int(pt));
 }
 
-inline SquareDelta pawn_push(Color c) {
-    return (c == WHITE ? DELTA_N : DELTA_S);
-}
-
-inline bool piece_type_is_ok(PieceType pc) {
-  return pc >= PAWN && pc <= KING;
+inline bool piece_type_is_ok(PieceType pt) {
+  return pt >= PAWN && pt <= KING;
 }
 
-inline bool piece_is_ok(Piece pc) {
-  return piece_type_is_ok(type_of_piece(pc)) && color_is_ok(color_of_piece(pc));
+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) {
-  return std::string(" PNBRQK")[pt];
-}
-
-inline PieceType piece_type_from_char(char c) {
-  return PieceType(std::string(" PNBRQK").find(c));
+  static const char ch[] = " PNBRQK";
+  return ch[pt];
 }
 
 #endif // !defined(PIECE_H_INCLUDED)