Retire color.h

[stockfish] / src / piece.h

diff --git a/src/piece.h b/src/piece.h
index 64c94082af826f5ae030fbec0da45f15f4a0d830..341e877dab938863708cc6216676d0766e933fef 100644 (file)
--- a/src/piece.h
+++ b/src/piece.h
@@ -17,25 +17,11 @@
   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 +32,13 @@ enum Piece {
   BP = 9, BN = 10, BB = 11, BR = 12, BQ = 13, BK = 14, PIECE_NONE = 16
 };
 
+enum Color {
+  WHITE, BLACK, COLOR_NONE
+};
+
 ENABLE_OPERATORS_ON(PieceType)
 ENABLE_OPERATORS_ON(Piece)
-
-
-////
-//// Constants
-////
+ENABLE_OPERATORS_ON(Color)
 
 /// Important: If the material values are changed, one must also
 /// adjust the piece square tables, and the method game_phase() in the
@@ -71,10 +57,9 @@ const Value RookValueEndgame   = Value(0x4FE);
 const Value QueenValueMidgame  = Value(0x9D9);
 const Value QueenValueEndgame  = Value(0x9FE);
 
-
-////
-//// Inline functions
-////
+inline Piece make_piece(Color c, PieceType pt) {
+  return Piece((int(c) << 3) | int(pt));
+}
 
 inline PieceType type_of_piece(Piece p)  {
   return PieceType(int(p) & 7);
@@ -84,12 +69,12 @@ inline Color color_of_piece(Piece p) {
   return Color(int(p) >> 3);
 }
 
-inline Piece piece_of_color_and_type(Color c, PieceType pt) {
-  return Piece((int(c) << 3) | int(pt));
+inline Color opposite_color(Color c) {
+  return Color(int(c) ^ 1);
 }
 
-inline Square pawn_push(Color c) {
-    return (c == WHITE ? DELTA_N : DELTA_S);
+inline bool color_is_ok(Color c) {
+  return c == WHITE || c == BLACK;
 }
 
 inline bool piece_type_is_ok(PieceType pt) {
@@ -101,11 +86,8 @@ inline bool piece_is_ok(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)