X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fsquare.h;h=0e314b04ac809f017d42d162a8d381caad9b8d99;hb=c006435bb4b93aa15ea904da50070f360e365291;hp=d539e0054df8ed99ca4497f1b39fe6202adb4c8d;hpb=8e31764c49149cd73cdbfd8a251bb31f068bf799;p=stockfish
diff --git a/src/square.h b/src/square.h
index d539e005..0e314b04 100644
--- a/src/square.h
+++ b/src/square.h
@@ -17,25 +17,15 @@
along with this program. If not, see .
*/
-
#if !defined(SQUARE_H_INCLUDED)
#define SQUARE_H_INCLUDED
-////
-//// Includes
-////
-
#include // for abs()
#include
#include "color.h"
#include "misc.h"
-
-////
-//// Types
-////
-
enum Square {
SQ_A1, SQ_B1, SQ_C1, SQ_D1, SQ_E1, SQ_F1, SQ_G1, SQ_H1,
SQ_A2, SQ_B2, SQ_C2, SQ_D2, SQ_E2, SQ_F2, SQ_G2, SQ_H2,
@@ -49,33 +39,32 @@ enum Square {
};
enum File {
- FILE_A, FILE_B, FILE_C, FILE_D, FILE_E, FILE_F, FILE_G, FILE_H, FILE_NONE
+ FILE_A, FILE_B, FILE_C, FILE_D, FILE_E, FILE_F, FILE_G, FILE_H
};
enum Rank {
- RANK_1, RANK_2, RANK_3, RANK_4, RANK_5, RANK_6, RANK_7, RANK_8, RANK_NONE
+ RANK_1, RANK_2, RANK_3, RANK_4, RANK_5, RANK_6, RANK_7, RANK_8
};
enum SquareDelta {
- DELTA_SSW = -021, DELTA_SS = -020, DELTA_SSE = -017, DELTA_SWW = -012,
- DELTA_SW = -011, DELTA_S = -010, DELTA_SE = -07, DELTA_SEE = -06,
- DELTA_W = -01, DELTA_ZERO = 0, DELTA_E = 01, DELTA_NWW = 06, DELTA_NW = 07,
- DELTA_N = 010, DELTA_NE = 011, DELTA_NEE = 012, DELTA_NNW = 017,
- DELTA_NN = 020, DELTA_NNE = 021
-};
-
-////
-//// Constants
-////
+ DELTA_N = 8, DELTA_E = 1, DELTA_S = -8, DELTA_W = -1, DELTA_NONE = 0,
-const int FlipMask = 070;
-const int FlopMask = 07;
+ DELTA_NN = DELTA_N + DELTA_N,
+ DELTA_NE = DELTA_N + DELTA_E,
+ DELTA_SE = DELTA_S + DELTA_E,
+ DELTA_SS = DELTA_S + DELTA_S,
+ DELTA_SW = DELTA_S + DELTA_W,
+ DELTA_NW = DELTA_N + DELTA_W
+};
+ENABLE_OPERATORS_ON(Square)
+ENABLE_OPERATORS_ON(File)
+ENABLE_OPERATORS_ON(Rank)
+ENABLE_OPERATORS_ON(SquareDelta)
-////
-//// Inline functions
-////
+const int FlipMask = 56;
+const int FlopMask = 7;
inline Square operator+ (Square x, SquareDelta i) { return x + Square(i); }
inline void operator+= (Square& x, SquareDelta i) { x = x + Square(i); }
@@ -106,17 +95,21 @@ inline Square relative_square(Color c, Square s) {
return Square(int(s) ^ (int(c) * FlipMask));
}
+inline Rank relative_rank(Color c, Rank r) {
+ return Rank(int(r) ^ (int(c) * 7));
+}
+
inline Rank relative_rank(Color c, Square s) {
- return square_rank(relative_square(c, s));
+ return relative_rank(c, square_rank(s));
}
inline SquareColor square_color(Square s) {
return SquareColor((int(square_file(s)) + int(square_rank(s))) & 1);
}
-inline bool same_color_squares(Square s1, Square s2) {
+inline bool opposite_color_squares(Square s1, Square s2) {
int s = int(s1) ^ int(s2);
- return (((s >> 3) ^ s) & 1) == 0;
+ return ((s >> 3) ^ s) & 1;
}
inline int file_distance(File f1, File f2) {
@@ -155,10 +148,6 @@ inline char rank_to_char(Rank r) {
return char(r - RANK_1 + int('1'));
}
-inline Square square_from_string(const std::string& str) {
- return make_square(file_from_char(str[0]), rank_from_char(str[1]));
-}
-
inline const std::string square_to_string(Square s) {
return std::string(1, file_to_char(square_file(s)))
+ std::string(1, rank_to_char(square_rank(s)));
@@ -173,7 +162,7 @@ inline bool rank_is_ok(Rank r) {
}
inline bool square_is_ok(Square s) {
- return file_is_ok(square_file(s)) && rank_is_ok(square_rank(s));
+ return s >= SQ_A1 && s <= SQ_H8;
}
#endif // !defined(SQUARE_H_INCLUDED)